Attachment 18102 Details for Bug 32646 – warns.diff

[patch] warns.diff

warns.diff (text/plain), 13.73 KB, created by mux on 2001-12-09 13:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mux

Created: 2001-12-09 13:00:01 UTC

Size: 13.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/src/usr.sbin/gifconfig/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- Makefile	20 Jul 2001 06:19:47 -0000	1.4
>+++ Makefile	7 Dec 2001 00:12:13 -0000
>@@ -18,5 +18,6 @@
> MAN=	gifconfig.8
> 
> CFLAGS+= -DINET6
>+WARNS?= 2
> 
> .include <bsd.prog.mk>
>Index: gifconfig.c
>===================================================================
>RCS file: /home/ncvs/src/usr.sbin/gifconfig/gifconfig.c,v
>retrieving revision 1.5
>diff -u -r1.5 gifconfig.c
>--- gifconfig.c	24 Jun 2001 23:41:32 -0000	1.5
>+++ gifconfig.c	9 Dec 2001 12:36:18 -0000
>@@ -112,7 +112,7 @@
> #define	NEXTARG		0xffffff
> 
> static struct	cmd {
>-	char	*c_name;
>+	const char *c_name;
> 	int	c_parameter;		/* NEXTARG means next argv */
> 	void	(*c_func) __P((char *, int));
> } cmds[] = {
>@@ -137,20 +137,20 @@
> void in6_status __P((int));
> #endif
> void ether_status __P((int));
>-void Perror __P((char *));
>+void Perror __P((const char *));
> void in_getaddr __P((char *, int));
> #ifdef INET6
> void in6_getaddr __P((char *, int));
> void in6_getprefix __P((char *, int));
> #endif
>-void printb __P((char *, unsigned int, char *));
>+void printb __P((const char *, unsigned int, const char *));
> int prefix __P((void *, int));
> 
> char ntop_buf[INET6_ADDRSTRLEN];
> 
> /* Known address families */
> struct afswtch {
>-	char *af_name;
>+	const char *af_name;
> 	short af_af;
> 	void (*af_status) __P((int));
> 	void (*af_getaddr) __P((char *, int));
>@@ -166,8 +166,9 @@
> 	{ "inet6", AF_INET6, in6_status, in6_getaddr, in6_getprefix,
> 	     SIOCSIFPHYADDR_IN6, C(in6_addreq), C(in6_ifr) },
> #endif
>-	{ "ether", AF_INET, ether_status, NULL, NULL },	/* XXX not real!! */
>-	{ 0,	0,	    0,		0,	0 }
>+	/* XXX not real!! */
>+	{ "ether", AF_INET, ether_status, NULL, NULL, 0, 0, 0 },
>+	{ 0, 0, 0, 0, 0, 0, 0, 0 }
> };
> 
> struct afswtch *afp = NULL;	/*the address family being set or asked about*/
>@@ -564,8 +565,8 @@
> {
> 	char psrcaddr[256];
> 	char pdstaddr[256];
>-	int flags = NI_NUMERICHOST;
>-	char *af;
>+	int flag = NI_NUMERICHOST;
>+	const char *af;
> #ifndef SIOCGLIFPHYADDR
> 	u_long srccmd, dstcmd;
> 	struct ifreq *ifrp;
>@@ -605,12 +606,12 @@
> 		af = "inet";
> #endif /* INET6 */
> 		if (getnameinfo(&ifrp->ifr_addr, ifrp->ifr_addr.sa_len,
>-		    psrcaddr, sizeof(psrcaddr), 0, 0, flags) != 0)
>+		    psrcaddr, sizeof(psrcaddr), 0, 0, flag) != 0)
> 			psrcaddr[0] = '\0';
> 	}
> 	if (0 <= ioctl(s, dstcmd, (caddr_t)ifrp)) {
> 		if (getnameinfo(&ifrp->ifr_addr, ifrp->ifr_addr.sa_len,
>-		    pdstaddr, sizeof(pdstaddr), 0, 0, flags) != 0)
>+		    pdstaddr, sizeof(pdstaddr), 0, 0, flag) != 0)
> 			pdstaddr[0] = '\0';
> 	}
> 	printf("\tphysical address %s %s --> %s\n", af, psrcaddr, pdstaddr);
>@@ -636,11 +637,11 @@
> #endif /* INET6 */
> 		}
> 		if (getnameinfo((struct sockaddr *)&iflr.addr, iflr.addr.ss_len,
>-		    psrcaddr, sizeof(psrcaddr), 0, 0, flags) != 0)
>+		    psrcaddr, sizeof(psrcaddr), 0, 0, flag) != 0)
> 			psrcaddr[0] = '\0';
> 		if (getnameinfo((struct sockaddr *)&iflr.dstaddr,
> 		    iflr.dstaddr.ss_len, pdstaddr, sizeof(pdstaddr), 0, 0,
>-		    flags) != 0)
>+		    flag) != 0)
> 			pdstaddr[0] = '\0';
> 	}
> 	printf("\tphysical address %s %s --> %s\n", af, psrcaddr, pdstaddr);
>@@ -651,40 +652,40 @@
> in_status(force)
> 	int force;
> {
>-	struct sockaddr_in *sin, null_sin;
>+	struct sockaddr_in *addr, null_sin;
> #if 0
> 	char *inet_ntoa();
> #endif
> 	
> 	memset(&null_sin, 0, sizeof(null_sin));
> 
>-	sin = (struct sockaddr_in *)info.rti_info[RTAX_IFA];
>-	if (!sin || sin->sin_family != AF_INET) {
>+	addr = (struct sockaddr_in *)info.rti_info[RTAX_IFA];
>+	if (!addr || addr->sin_family != AF_INET) {
> 		if (!force)
> 			return;
> 		/* warnx("%s has no AF_INET IFA address!", name); */
>-		sin = &null_sin;
>+		addr = &null_sin;
> 	}
>-	printf("\tinet %s ", inet_ntoa(sin->sin_addr));
>+	printf("\tinet %s ", inet_ntoa(addr->sin_addr));
> 
> 	if (flags & IFF_POINTOPOINT) {
> 		/* note RTAX_BRD overlap with IFF_BROADCAST */
>-		sin = (struct sockaddr_in *)info.rti_info[RTAX_BRD];
>-		if (!sin)
>-			sin = &null_sin;
>-		printf("--> %s ", inet_ntoa(sin->sin_addr));
>+		addr = (struct sockaddr_in *)info.rti_info[RTAX_BRD];
>+		if (!addr)
>+			addr = &null_sin;
>+		printf("--> %s ", inet_ntoa(addr->sin_addr));
> 	}
> 
>-	sin = (struct sockaddr_in *)info.rti_info[RTAX_NETMASK];
>-	if (!sin)
>-		sin = &null_sin;
>-	printf("netmask 0x%x ", (u_int32_t)ntohl(sin->sin_addr.s_addr));
>+	addr = (struct sockaddr_in *)info.rti_info[RTAX_NETMASK];
>+	if (!addr)
>+		addr = &null_sin;
>+	printf("netmask 0x%x ", (u_int32_t)ntohl(addr->sin_addr.s_addr));
> 
> 	if (flags & IFF_BROADCAST) {
> 		/* note RTAX_BRD overlap with IFF_POINTOPOINT */
>-		sin = (struct sockaddr_in *)info.rti_info[RTAX_BRD];
>-		if (sin && sin->sin_addr.s_addr != 0)
>-			printf("broadcast %s", inet_ntoa(sin->sin_addr));
>+		addr = (struct sockaddr_in *)info.rti_info[RTAX_BRD];
>+		if (addr && addr->sin_addr.s_addr != 0)
>+			printf("broadcast %s", inet_ntoa(addr->sin_addr));
> 	}
> 	putchar('\n');
> }
>@@ -694,7 +695,7 @@
> in6_status(force)
> 	int force;
> {
>-	struct sockaddr_in6 *sin, null_sin;
>+	struct sockaddr_in6 *addr, null_sin;
> 	char hostname[NI_MAXHOST];
> 	int niflags = NI_NUMERICHOST;
> 
>@@ -703,51 +704,51 @@
> 	niflags |= NI_WITHSCOPEID;
> #endif
> 
>-	sin = (struct sockaddr_in6 *)info.rti_info[RTAX_IFA];
>-	if (!sin || sin->sin6_family != AF_INET6) {
>+	addr = (struct sockaddr_in6 *)info.rti_info[RTAX_IFA];
>+	if (!addr || addr->sin6_family != AF_INET6) {
> 		if (!force)
> 			return;
> 		/* warnx("%s has no AF_INET6 IFA address!", name); */
>-		sin = &null_sin;
>+		addr = &null_sin;
> 	}
> #ifdef __KAME__
>-	if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
>-		sin->sin6_scope_id =
>-			ntohs(*(u_int16_t *)&sin->sin6_addr.s6_addr[2]);
>-		sin->sin6_addr.s6_addr[2] = 0;
>-		sin->sin6_addr.s6_addr[3] = 0;
>+	if (IN6_IS_ADDR_LINKLOCAL(&addr->sin6_addr)) {
>+		addr->sin6_scope_id =
>+			ntohs(*(u_int16_t *)&addr->sin6_addr.s6_addr[2]);
>+		addr->sin6_addr.s6_addr[2] = 0;
>+		addr->sin6_addr.s6_addr[3] = 0;
> 	}
> #endif
>-	getnameinfo((struct sockaddr *)sin, sin->sin6_len,
>+	getnameinfo((struct sockaddr *)addr, addr->sin6_len,
> 		    hostname, sizeof(hostname), 0, 0, niflags);
> 	printf("\tinet6 %s ", hostname);
> 
> 	if (flags & IFF_POINTOPOINT) {
> 		/* note RTAX_BRD overlap with IFF_BROADCAST */
>-		sin = (struct sockaddr_in6 *)info.rti_info[RTAX_BRD];
>+		addr = (struct sockaddr_in6 *)info.rti_info[RTAX_BRD];
> 		/*
> 		 * some of ther interfaces do not have valid destination
> 		 * address.
> 		 */
>-		if (sin->sin6_family == AF_INET6) {
>+		if (addr->sin6_family == AF_INET6) {
> #ifdef __KAME__
>-			if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
>-				sin->sin6_scope_id =
>-					ntohs(*(u_int16_t *)&sin->sin6_addr.s6_addr[2]);
>-				sin->sin6_addr.s6_addr[2] = 0;
>-				sin->sin6_addr.s6_addr[3] = 0;
>+			if (IN6_IS_ADDR_LINKLOCAL(&addr->sin6_addr)) {
>+				addr->sin6_scope_id =
>+					ntohs(*(u_int16_t *)&addr->sin6_addr.s6_addr[2]);
>+				addr->sin6_addr.s6_addr[2] = 0;
>+				addr->sin6_addr.s6_addr[3] = 0;
> 			}
> #endif
>-			getnameinfo((struct sockaddr *)sin, sin->sin6_len,
>+			getnameinfo((struct sockaddr *)addr, addr->sin6_len,
> 				    hostname, sizeof(hostname), 0, 0, niflags);
> 			printf("--> %s ", hostname);
> 		}
> 	}
> 
>-	sin = (struct sockaddr_in6 *)info.rti_info[RTAX_NETMASK];
>-	if (!sin)
>-		sin = &null_sin;
>-	printf(" prefixlen %d ", prefix(&sin->sin6_addr,
>+	addr = (struct sockaddr_in6 *)info.rti_info[RTAX_NETMASK];
>+	if (!addr)
>+		addr = &null_sin;
>+	printf(" prefixlen %d ", prefix(&addr->sin6_addr,
> 		sizeof(struct in6_addr)));
> 
> 	putchar('\n');
>@@ -778,7 +779,7 @@
> 
> void
> Perror(cmd)
>-	char *cmd;
>+	const char *cmd;
> {
> 	switch (errno) {
> 
>@@ -800,25 +801,25 @@
> SIN(addreq.ifra_addr), SIN(addreq.ifra_dstaddr)};
> 
> void
>-in_getaddr(s, which)
>-	char *s;
>+in_getaddr(str, which)
>+	char *str;
> 	int which;
> {
>-	register struct sockaddr_in *sin = sintab[which];
>+	register struct sockaddr_in *addr = sintab[which];
> 	struct hostent *hp;
> 	struct netent *np;
> 
>-	sin->sin_len = sizeof(*sin);
>-	sin->sin_family = AF_INET;
>+	addr->sin_len = sizeof(*addr);
>+	addr->sin_family = AF_INET;
> 
>-	if (inet_aton(s, &sin->sin_addr))
>+	if (inet_aton(str, &addr->sin_addr))
> 		;
>-	else if ((hp = gethostbyname(s)) != NULL)
>-		bcopy(hp->h_addr, (char *)&sin->sin_addr, hp->h_length);
>-	else if ((np = getnetbyname(s)) != NULL)
>-		sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
>+	else if ((hp = gethostbyname(str)) != NULL)
>+		bcopy(hp->h_addr, (char *)&addr->sin_addr, hp->h_length);
>+	else if ((np = getnetbyname(str)) != NULL)
>+		addr->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
> 	else
>-		errx(1, "%s: bad value", s);
>+		errx(1, "%s: bad value", str);
> }
> 
> #ifdef INET6
>@@ -827,17 +828,17 @@
> SIN6(in6_addreq.ifra_addr), SIN6(in6_addreq.ifra_dstaddr)};
> 
> void
>-in6_getaddr(s, which)
>-	char *s;
>+in6_getaddr(str, which)
>+	char *str;
> 	int which;
> {
>-	register struct sockaddr_in6 *sin = sin6tab[which];
>+	register struct sockaddr_in6 *addr = sin6tab[which];
> 
>-	sin->sin6_len = sizeof(*sin);
>-	sin->sin6_family = AF_INET6;
>+	addr->sin6_len = sizeof(*addr);
>+	addr->sin6_family = AF_INET6;
> 
>-        if (inet_pton(AF_INET6, s, &sin->sin6_addr) != 1)
>-		errx(1, "%s: bad value", s);
>+        if (inet_pton(AF_INET6, str, &addr->sin6_addr) != 1)
>+		errx(1, "%s: bad value", str);
> }
> 
> void
>@@ -845,19 +846,19 @@
> 	char *plen;
> 	int which;
> {
>-	register struct sockaddr_in6 *sin = sin6tab[which];
>+	register struct sockaddr_in6 *addr = sin6tab[which];
> 	register u_char *cp;
> 	int len = atoi(plen);
> 
> 	if ((len < 0) || (len > 128))
> 		errx(1, "%s: bad value", plen);
>-	sin->sin6_len = sizeof(*sin);
>-	sin->sin6_family = AF_INET6;
>+	addr->sin6_len = sizeof(*addr);
>+	addr->sin6_family = AF_INET6;
> 	if ((len == 0) || (len == 128)) {
>-		memset(&sin->sin6_addr, -1, sizeof(struct in6_addr));
>+		memset(&addr->sin6_addr, -1, sizeof(struct in6_addr));
> 		return;
> 	}
>-	for (cp = (u_char *)&sin->sin6_addr; len > 7; len -= 8)
>+	for (cp = (u_char *)&addr->sin6_addr; len > 7; len -= 8)
> 		*cp++ = -1;
> 	*cp = (-1) << (8 - len);
> }
>@@ -867,18 +868,18 @@
>  * Print a value a la the %b format of the kernel's printf
>  */
> void
>-printb(s, v, bits)
>-	char *s;
>+printb(str, v, bits)
>+	const char *str;
> 	register unsigned int v;
>-	register char *bits;
>+	register const char *bits;
> {
> 	register int i, any = 0;
> 	register char c;
> 
> 	if (bits && *bits == 8)
>-		printf("%s=%o", s, v & 0xffff);
>+		printf("%s=%o", str, v & 0xffff);
> 	else
>-		printf("%s=%x", s, v & 0xffff);
>+		printf("%s=%x", str, v & 0xffff);
> 	bits++;
> 	if (bits) {
> 		putchar('<');
>@@ -903,23 +904,23 @@
>         void *val;
>         int size;
> {
>-        register u_char *name = (u_char *)val;
>+        register u_char *nam = (u_char *)val;
>         register int byte, bit, plen = 0;
> 
>         for (byte = 0; byte < size; byte++, plen += 8)
>-                if (name[byte] != 0xff)
>+                if (nam[byte] != 0xff)
>                         break;
> 	if (byte == size)
> 		return (plen);
> 	for (bit = 7; bit != 0; bit--, plen++)
>-                if (!(name[byte] & (1 << bit)))
>+                if (!(nam[byte] & (1 << bit)))
>                         break;
>         for (; bit != 0; bit--)
>-                if (name[byte] & (1 << bit))
>+                if (nam[byte] & (1 << bit))
>                         return(0);
>         byte++;
>         for (; byte < size; byte++)
>-                if (name[byte])
>+                if (nam[byte])
>                         return(0);
>         return (plen);
> }
>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/src/usr.sbin/cdcontrol/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- Makefile	20 Jul 2001 15:33:04 -0000	1.7
>+++ Makefile	9 Dec 2001 12:39:21 -0000
>@@ -5,4 +5,6 @@
> DPADD=	${LIBEDIT} ${LIBTERMCAP}
> LDADD=	-ledit -ltermcap
> 
>+WARNS?= 2
>+
> .include <bsd.prog.mk>
>Index: cdcontrol.c
>===================================================================
>RCS file: /home/ncvs/src/usr.sbin/cdcontrol/cdcontrol.c,v
>retrieving revision 1.34
>diff -u -r1.34 cdcontrol.c
>--- cdcontrol.c	1 Oct 2001 08:46:44 -0000	1.34
>+++ cdcontrol.c	9 Dec 2001 12:49:13 -0000
>@@ -78,9 +78,9 @@
> 
> struct cmdtab {
> 	int command;
>-	char *name;
>-	unsigned  min;
>-	char *args;
>+	const char *name;
>+	unsigned min;
>+	const char *args;
> } cmdtab[] = {
> { CMD_CLOSE,    "close",        1, "" },
> { CMD_DEBUG,    "debug",        1, "on | off" },
>@@ -103,7 +103,7 @@
> { CMD_STOP,     "stop",         3, "" },
> { CMD_VOLUME,   "volume",       1, "<l> <r> | left | right | mute | mono | stereo" },
> { CMD_CDID,     "cdid",         2, "" },
>-{ 0, }
>+{ 0, NULL, 0, NULL }
> };
> 
> struct cd_toc_entry     toc_buffer[100];
>@@ -133,11 +133,18 @@
> int             play_blocks __P((int blk, int len));
> int             run __P((int cmd, char *arg));
> char            *parse __P((char *buf, int *cmd));
>+void            help __P((void));
>+void            usage __P((void));
>+char            *use_cdrom_instead __P((const char *));
>+const char      *strstatus __P((int));
>+static u_int    dbprog_discid __P((void));
>+const char      *cdcontrol_prompt __P((void));
> 
> void help ()
> {
> 	struct cmdtab *c;
>-	char *s, n;
>+	const char *s;
>+	char n;
> 	int i;
> 
> 	for (c=cmdtab; c->name; ++c) {
>@@ -165,7 +172,7 @@
> 	exit (1);
> }
> 
>-char *use_cdrom_instead(char *old_envvar)
>+char *use_cdrom_instead(const char *old_envvar)
> {
> 	char *device;
> 
>@@ -427,7 +434,8 @@
> int play (char *arg)
> {
> 	struct ioc_toc_header h;
>-	int rc, n, start, end = 0, istart = 1, iend = 1;
>+	unsigned int n;
>+	int rc, start, end = 0, istart = 1, iend = 1;
> 
> 	rc = ioctl (fd, CDIOREADTOCHEADER, &h);
> 
>@@ -736,7 +744,7 @@
> 	return (play_track (trk, 1, n, 1));
> }
> 
>-char *strstatus (int sts)
>+const char *strstatus (int sts)
> {
> 	switch (sts) {
> 	case ASTS_INVALID:   return ("invalid");
>@@ -905,7 +913,7 @@
> 	return id ? 0 : 1;
> }
> 
>-int info (char *arg)
>+int info (char *arg __unused)
> {
> 	struct ioc_toc_header h;
> 	int rc, i, n;
>@@ -1146,7 +1154,7 @@
> {
> 	struct cmdtab *c;
> 	char *p;
>-	int len;
>+	unsigned int len;
> 
> 	for (p=buf; isspace (*p); p++)
> 		continue;

Actions: View | Diff

Attachments on bug 32646: 18102