Module Name: src
Committed By: martin
Date: Fri Nov 22 19:59:36 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/ip: ip_read.c
src/external/bsd/nvi/dist/ipc: ip_run.c
Log Message:
Quell warnings from gcc 4.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/dist/ip/ip_read.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/dist/ipc/ip_run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/ip/ip_read.c
diff -u src/external/bsd/nvi/dist/ip/ip_read.c:1.2 src/external/bsd/nvi/dist/ip/ip_read.c:1.3
--- src/external/bsd/nvi/dist/ip/ip_read.c:1.2 Fri Nov 22 15:52:05 2013
+++ src/external/bsd/nvi/dist/ip/ip_read.c Fri Nov 22 19:59:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_read.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/* $NetBSD: ip_read.c,v 1.3 2013/11/22 19:59:36 martin Exp $ */
/*-
* Copyright (c) 1996
* Keith Bostic. All rights reserved.
@@ -140,7 +140,7 @@ ip_wevent(WIN *wp, SCR *sp, EVENT *evp,
IP_PRIVATE *ipp;
struct timeval t, *tp;
int termread;
- int nr;
+ int nr = 0;
if (LF_ISSET(EC_INTERRUPT)) { /* XXX */
evp->e_event = E_TIMEOUT;
Index: src/external/bsd/nvi/dist/ipc/ip_run.c
diff -u src/external/bsd/nvi/dist/ipc/ip_run.c:1.2 src/external/bsd/nvi/dist/ipc/ip_run.c:1.3
--- src/external/bsd/nvi/dist/ipc/ip_run.c:1.2 Fri Nov 22 15:52:05 2013
+++ src/external/bsd/nvi/dist/ipc/ip_run.c Fri Nov 22 19:59:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_run.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/* $NetBSD: ip_run.c,v 1.3 2013/11/22 19:59:36 martin Exp $ */
/*-
* Copyright (c) 1996
* Rob Zimmermann. All rights reserved.
@@ -212,7 +212,7 @@ channel(int rpipe[2], int wpipe[2])
static void
arg_format(char *execp, int *argcp, char **argvp[], int i_fd, int o_fd)
{
- char *iarg, **largv, *p, **p_av, **t_av;
+ char *iarg, **largv = NULL /* XXX gcc */, *p, **p_av, **t_av;
/* Get space for the argument array and the -I argument. */
if ((iarg = malloc(64)) == NULL ||