Module Name: src
Committed By: mrg
Date: Sun Feb 4 09:01:13 UTC 2018
Modified Files:
src/usr.bin/mail: lex.c
src/usr.bin/telnet: sys_bsd.c
src/usr.sbin/isdn/isdnd: rc_config.c
src/usr.sbin/isdn/isdntrace: q931_util.c
src/usr.sbin/map-mbone: mapper.c
src/usr.sbin/sysinst: partman.c
src/usr.sbin/timed/timed: timed.c
Log Message:
fixes for GCC 6.4:
mail's execute() needs a volatile for setjmp().
telnet has a missing {} issue.
isdnd's print_config() has a missing/wrong {} issue, and
its p_q931bc() has inconsistent indentation (but not any
actual problem.)
map-mbone's accept_neighbors2() compares a vs. a instead
of a vs. b.
sysinst's pm_cgd_check() has missing {} issue.
timed's main() has missing {} issue.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/mail/lex.c
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/telnet/sys_bsd.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/isdn/isdnd/rc_config.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/isdn/isdntrace/q931_util.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/map-mbone/mapper.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/timed/timed/timed.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/lex.c
diff -u src/usr.bin/mail/lex.c:1.44 src/usr.bin/mail/lex.c:1.45
--- src/usr.bin/mail/lex.c:1.44 Thu Nov 9 20:27:50 2017
+++ src/usr.bin/mail/lex.c Sun Feb 4 09:01:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.44 2017/11/09 20:27:50 christos Exp $ */
+/* $NetBSD: lex.c,v 1.45 2018/02/04 09:01:12 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: lex.c,v 1.44 2017/11/09 20:27:50 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.45 2018/02/04 09:01:12 mrg Exp $");
#endif
#endif /* not lint */
@@ -627,7 +627,7 @@ execute(char linebuf[], enum execute_con
char *volatile cp;
int retval;
int c;
- int e = 1;
+ volatile int e = 1;
/*
* Strip the white space away from the beginning
Index: src/usr.bin/telnet/sys_bsd.c
diff -u src/usr.bin/telnet/sys_bsd.c:1.33 src/usr.bin/telnet/sys_bsd.c:1.34
--- src/usr.bin/telnet/sys_bsd.c:1.33 Mon Jan 9 16:08:55 2012
+++ src/usr.bin/telnet/sys_bsd.c Sun Feb 4 09:01:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_bsd.c,v 1.33 2012/01/09 16:08:55 christos Exp $ */
+/* $NetBSD: sys_bsd.c,v 1.34 2018/02/04 09:01:12 mrg Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -34,7 +34,7 @@
#if 0
from: static char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: sys_bsd.c,v 1.33 2012/01/09 16:08:55 christos Exp $");
+__RCSID("$NetBSD: sys_bsd.c,v 1.34 2018/02/04 09:01:12 mrg Exp $");
#endif
#endif /* not lint */
@@ -468,11 +468,12 @@ TerminalSpeeds(long *ispeed, long *ospee
out = cfgetospeed(&old_tc);
in = cfgetispeed(&old_tc);
- if (in == 0)
+ if (in == 0) {
in = out;
*ispeed = in;
*ospeed = out;
+ }
}
int
Index: src/usr.sbin/isdn/isdnd/rc_config.c
diff -u src/usr.sbin/isdn/isdnd/rc_config.c:1.26 src/usr.sbin/isdn/isdnd/rc_config.c:1.27
--- src/usr.sbin/isdn/isdnd/rc_config.c:1.26 Thu Mar 1 22:31:48 2012
+++ src/usr.sbin/isdn/isdnd/rc_config.c Sun Feb 4 09:01:12 2018
@@ -27,7 +27,7 @@
* i4b daemon - config file processing
* -----------------------------------
*
- * $Id: rc_config.c,v 1.26 2012/03/01 22:31:48 joerg Exp $
+ * $Id: rc_config.c,v 1.27 2018/02/04 09:01:12 mrg Exp $
*
* $FreeBSD$
*
@@ -1564,20 +1564,19 @@ print_config(void)
for (j = 0; j < cep->remote_numbers_count; j++)
fprintf(PFILE, "remote-phone-dialout = %s\t\t# telephone number %d for dialing out to remote\n", cep->remote_numbers[j].number, j+1);
- fprintf(PFILE, "remdial-handling = ");
+ fprintf(PFILE, "remdial-handling = ");
- switch (cep->remote_numbers_handling)
- {
- case RNH_NEXT:
- fprintf(PFILE, "next\t\t# use next number after last successful for new dial\n");
- break;
- case RNH_LAST:
- fprintf(PFILE, "last\t\t# use last successful number for new dial\n");
- break;
- case RNH_FIRST:
- fprintf(PFILE, "first\t\t# always start with first number for new dial\n");
- break;
- }
+ switch (cep->remote_numbers_handling)
+ {
+ case RNH_NEXT:
+ fprintf(PFILE, "next\t\t# use next number after last successful for new dial\n");
+ break;
+ case RNH_LAST:
+ fprintf(PFILE, "last\t\t# use last successful number for new dial\n");
+ break;
+ case RNH_FIRST:
+ fprintf(PFILE, "first\t\t# always start with first number for new dial\n");
+ break;
}
if (cep->local_phone_dialout[0])
@@ -1752,6 +1751,7 @@ print_config(void)
fprintf(PFILE, "downtime = %d\t\t# time device is switched off\n", cep->downtime);
}
}
+ }
}
fprintf(PFILE, "\n");
}
Index: src/usr.sbin/isdn/isdntrace/q931_util.c
diff -u src/usr.sbin/isdn/isdntrace/q931_util.c:1.3 src/usr.sbin/isdn/isdntrace/q931_util.c:1.4
--- src/usr.sbin/isdn/isdntrace/q931_util.c:1.3 Mon Oct 6 09:43:28 2003
+++ src/usr.sbin/isdn/isdntrace/q931_util.c Sun Feb 4 09:01:12 2018
@@ -27,7 +27,7 @@
* q931_util.c - utility functions to print Q.931 traces
* -----------------------------------------------------
*
- * $Id: q931_util.c,v 1.3 2003/10/06 09:43:28 itojun Exp $
+ * $Id: q931_util.c,v 1.4 2018/02/04 09:01:12 mrg Exp $
*
* $FreeBSD$
*
@@ -405,38 +405,38 @@ p_q931bc(char *pbuf, unsigned char *buf)
if (!len)
goto exit;
- switch (buf[i] & 0x7f)
- {
- case 0x42:
- sprintf((pbuf+strlen(pbuf)), "\n layer2=Q.921/I.441");
- break;
- case 0x46:
- sprintf((pbuf+strlen(pbuf)), "\n layer2=X.25 link");
- break;
- default:
- sprintf((pbuf+strlen(pbuf)), "\n layer2=0x%02x",(buf[i] & 0x7f));
- break;
- }
- i++;
- len--;
+ switch (buf[i] & 0x7f)
+ {
+ case 0x42:
+ sprintf((pbuf+strlen(pbuf)), "\n layer2=Q.921/I.441");
+ break;
+ case 0x46:
+ sprintf((pbuf+strlen(pbuf)), "\n layer2=X.25 link");
+ break;
+ default:
+ sprintf((pbuf+strlen(pbuf)), "\n layer2=0x%02x",(buf[i] & 0x7f));
+ break;
+ }
+ i++;
+ len--;
if (!len)
goto exit;
- switch (buf[i] & 0x7f)
- {
- case 0x62:
- sprintf((pbuf+strlen(pbuf)), "\n layer3=Q.921/I.441");
- break;
- case 0x66:
- sprintf((pbuf+strlen(pbuf)), "\n layer3=X.25 packet");
- break;
- default:
- sprintf((pbuf+strlen(pbuf)), "\n layer3=0x%02x",(buf[i] & 0x7f));
- break;
- }
- i++;
- len--;
+ switch (buf[i] & 0x7f)
+ {
+ case 0x62:
+ sprintf((pbuf+strlen(pbuf)), "\n layer3=Q.921/I.441");
+ break;
+ case 0x66:
+ sprintf((pbuf+strlen(pbuf)), "\n layer3=X.25 packet");
+ break;
+ default:
+ sprintf((pbuf+strlen(pbuf)), "\n layer3=0x%02x",(buf[i] & 0x7f));
+ break;
+ }
+ i++;
+ len--;
exit:
sprintf((pbuf+strlen(pbuf)), "]");
Index: src/usr.sbin/map-mbone/mapper.c
diff -u src/usr.sbin/map-mbone/mapper.c:1.26 src/usr.sbin/map-mbone/mapper.c:1.27
--- src/usr.sbin/map-mbone/mapper.c:1.26 Tue Jan 23 23:02:40 2018
+++ src/usr.sbin/map-mbone/mapper.c Sun Feb 4 09:01:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mapper.c,v 1.26 2018/01/23 23:02:40 sevan Exp $ */
+/* $NetBSD: mapper.c,v 1.27 2018/02/04 09:01:13 mrg Exp $ */
/* Mapper for connections between MRouteD multicast routers.
* Written by Pavel Curtis <pa...@parc.xerox.com>
@@ -495,7 +495,7 @@ void accept_neighbors2(u_int32_t src, u_
for (nb_n = old_neighbors; nb_n; nb_n = nb_n->next)
if (nb_i->addr == nb_n->addr) {
if (nb_i->metric != nb_n->metric
- || nb_i->threshold != nb_i->threshold)
+ || nb_i->threshold != nb_n->threshold)
logit(LOG_WARNING, 0,
"inconsistent %s for neighbor %s of %s",
"metric/threshold",
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.17 src/usr.sbin/sysinst/partman.c:1.18
--- src/usr.sbin/sysinst/partman.c:1.17 Mon Jan 29 16:24:23 2018
+++ src/usr.sbin/sysinst/partman.c Sun Feb 4 09:01:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.17 2018/01/29 16:24:23 martin Exp $ */
+/* $NetBSD: partman.c,v 1.18 2018/02/04 09:01:13 mrg Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -1099,10 +1099,11 @@ pm_cgd_check(void *arg)
return 0;
if (dev_ptr->pm == NULL)
dev_ptr->enabled = 0;
- else
+ else {
pm_manage_getfreenode(&(dev_ptr->node), "cgd", &cgds_t_info);
if (dev_ptr->node < 0)
dev_ptr->enabled = 0;
+ }
return dev_ptr->enabled;
}
Index: src/usr.sbin/timed/timed/timed.c
diff -u src/usr.sbin/timed/timed/timed.c:1.25 src/usr.sbin/timed/timed/timed.c:1.26
--- src/usr.sbin/timed/timed/timed.c:1.25 Tue Jun 16 23:04:14 2015
+++ src/usr.sbin/timed/timed/timed.c Sun Feb 4 09:01:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: timed.c,v 1.25 2015/06/16 23:04:14 christos Exp $ */
+/* $NetBSD: timed.c,v 1.26 2018/02/04 09:01:13 mrg Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 19
#if 0
static char sccsid[] = "@(#)timed.c 8.2 (Berkeley) 3/26/95";
#else
-__RCSID("$NetBSD: timed.c,v 1.25 2015/06/16 23:04:14 christos Exp $");
+__RCSID("$NetBSD: timed.c,v 1.26 2018/02/04 09:01:13 mrg Exp $");
#endif
#endif /* not lint */
@@ -405,9 +405,10 @@ main(int argc, char *argv[])
justquit = 1;
}
for (ntp = nettab; ntp != NULL; ntp = ntp->next) {
- if (ntp->status == MASTER)
+ if (ntp->status == MASTER) {
rmnetmachs(ntp);
ntp->status = NOMASTER;
+ }
}
checkignorednets();
pickslavenet(0);
