Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/rtadvd fix misplaced paren, add missing va_end()



details:   https://anonhg.NetBSD.org/src/rev/12ad588d1246
branches:  trunk
changeset: 960619:12ad588d1246
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 23 18:06:19 2021 +0000

description:
fix misplaced paren, add missing va_end()

diffstat:

 usr.sbin/rtadvd/rtadvd.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 6f052cd95183 -r 12ad588d1246 usr.sbin/rtadvd/rtadvd.c
--- a/usr.sbin/rtadvd/rtadvd.c  Tue Mar 23 17:36:55 2021 +0000
+++ b/usr.sbin/rtadvd/rtadvd.c  Tue Mar 23 18:06:19 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtadvd.c,v 1.80 2021/03/22 18:41:11 christos Exp $     */
+/*     $NetBSD: rtadvd.c,v 1.81 2021/03/23 18:06:19 christos Exp $     */
 /*     $KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $    */
 
 /*
@@ -1615,7 +1615,7 @@
        }
 #ifdef RO_MSGFILTER
        if (prog_setsockopt(rtsock, PF_ROUTE, RO_MSGFILTER,
-           &msgfilter, sizeof(msgfilter) == -1))
+           &msgfilter, sizeof(msgfilter)) == -1)
                logit(LOG_ERR, "%s: RO_MSGFILTER: %m", __func__);
 #endif
 }
@@ -1804,13 +1804,14 @@
        va_start(ap, fmt);
        if (!Dflag && after_daemon) {
                vsyslog(level, fmt, ap);
-               va_end(ap);
-               return;
+               goto out;
        }
-       if (level >= LOG_INFO && !dflag)
-               return;
+       if (level >= LOG_INFO && !dflag) {
+               goto out;
+       }
 
        vwarnx(expandm(fmt, "", &buf), ap);
        free(buf);
+out:
        va_end(ap);
 }



Home | Main Index | Thread Index | Old Index