[src/trunk]: src/external/bsd/ntp/dist/ntpd stoa() already includes the scope...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c2975bb6cca
branches:  trunk
changeset: 326340:0c2975bb6cca
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Jan 26 02:21:08 2014 +0000

description:
stoa() already includes the scope, no need to print it twice.

diffstat:

 external/bsd/ntp/dist/ntpd/ntp_io.c |  13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diffs (36 lines):

diff -r 80e907c5bfa5 -r 0c2975bb6cca external/bsd/ntp/dist/ntpd/ntp_io.c
--- a/external/bsd/ntp/dist/ntpd/ntp_io.c       Sun Jan 26 01:57:04 2014 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_io.c       Sun Jan 26 02:21:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_io.c,v 1.13 2014/01/17 17:25:47 roy Exp $  */
+/*     $NetBSD: ntp_io.c,v 1.14 2014/01/26 02:21:08 mlelstv Exp $      */
 
 /*
  * ntp_io.c - input/output routines for ntpd.  The socket-opening code
@@ -2818,7 +2818,6 @@
 {
        SOCKET  fd;
        int     errval;
-       char    scopetext[16];
        /*
         * int is OK for REUSEADR per
         * http://www.kohala.com/start/mcast.api.txt
@@ -2968,16 +2967,10 @@
                    || debug > 1
 #endif
                    ) {
-                       if (SCOPE(addr))
-                               snprintf(scopetext, sizeof(scopetext),
-                                        "%%%d", SCOPE(addr));
-                       else
-                               scopetext[0] = 0;
-
                        msyslog(LOG_ERR,
-                               "bind(%d) AF_INET%s %s%s#%d%s flags 0x%x failed: %m",
+                               "bind(%d) AF_INET%s %s#%d%s flags 0x%x failed: %m",
                                fd, IS_IPV6(addr) ? "6" : "",
-                               stoa(addr), scopetext, SRCPORT(addr),
+                               stoa(addr), SRCPORT(addr),
                                IS_MCAST(addr) ? " (multicast)" : "",
                                interf->flags);
                }