[src/trunk]: src/usr.sbin/mrinfo Match latest mouted code

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

details:   https://anonhg.NetBSD.org/src/rev/8ff296bceafd
branches:  trunk
changeset: 547313:8ff296bceafd
user:      dsl <dsl%NetBSD.org@localhost>
date:      Fri May 16 23:10:15 2003 +0000

description:
Match latest mouted code

diffstat:

 usr.sbin/mrinfo/mrinfo.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (81 lines):

diff -r e5fd7f74b7f7 -r 8ff296bceafd usr.sbin/mrinfo/mrinfo.c
--- a/usr.sbin/mrinfo/mrinfo.c  Fri May 16 23:00:29 2003 +0000
+++ b/usr.sbin/mrinfo/mrinfo.c  Fri May 16 23:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mrinfo.c,v 1.21 2003/05/16 18:10:37 itojun Exp $       */
+/*     $NetBSD: mrinfo.c,v 1.22 2003/05/16 23:10:15 dsl Exp $  */
 
 /*
  * This tool requests configuration info from a multicast router
@@ -80,7 +80,7 @@
 static char rcsid[] =
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 #else
-__RCSID("$NetBSD: mrinfo.c,v 1.21 2003/05/16 18:10:37 itojun Exp $");
+__RCSID("$NetBSD: mrinfo.c,v 1.22 2003/05/16 23:10:15 dsl Exp $");
 #endif
 #endif
 
@@ -198,7 +198,7 @@
 #define GET_ADDR(a) (a = ((u_int32_t)*p++ << 24), a += ((u_int32_t)*p++ << 16),\
                     a += ((u_int32_t)*p++ << 8), a += *p++)
 
-       printf("%s (%s):\n", inet_fmt(src, s1, sizeof(s1)), inet_name(src));
+       printf("%s (%s):\n", inet_fmt(src), inet_name(src));
        while (p < ep) {
                u_int32_t laddr;
                u_char metric;
@@ -214,9 +214,9 @@
                        u_int32_t neighbor;
                        GET_ADDR(neighbor);
                        neighbor = htonl(neighbor);
-                       printf("  %s -> ", inet_fmt(laddr, s1, sizeof(s1)));
+                       printf("  %s -> ", inet_fmt(laddr));
                        printf("%s (%s) [%d/%d]\n",
-                               inet_fmt(neighbor, s1, sizeof(s1)),
+                               inet_fmt(neighbor),
                               inet_name(neighbor), metric, thresh);
                }
        }
@@ -230,7 +230,7 @@
        u_int broken_cisco = ((level & 0xffff) == 0x020a); /* 10.2 */
        /* well, only possibly_broken_cisco, but that's too long to type. */
 
-       printf("%s (%s) [version %d.%d", inet_fmt(src, s1, sizeof(s1)),
+       printf("%s (%s) [version %d.%d", inet_fmt(src),
                inet_name(src), level & 0xff, (level >> 8) & 0xff);
        if ((level >> 16) & NF_LEAF)   { printf (",leaf"); }
        if ((level >> 16) & NF_PRUNE)  { printf (",prune"); }
@@ -257,9 +257,9 @@
                while (--ncount >= 0 && p < ep) {
                        u_int32_t neighbor = *(u_int32_t*)p;
                        p += 4;
-                       printf("  %s -> ", inet_fmt(laddr, s1, sizeof(s1)));
+                       printf("  %s -> ", inet_fmt(laddr));
                        printf("%s (%s) [%d/%d",
-                               inet_fmt(neighbor, s1, sizeof(s1)),
+                               inet_fmt(neighbor),
                                inet_name(neighbor), metric, thresh);
                        if (flags & DVMRP_NF_TUNNEL)
                                printf("/tunnel");
@@ -502,7 +502,7 @@
                if (igmpdatalen < 0) {
                    logit(LOG_WARNING, 0,
                        "IP data field too short (%u bytes) for IGMP, from %s",
-                       ipdatalen, inet_fmt(src, s1, sizeof(s1)));
+                       ipdatalen, inet_fmt(src));
                    continue;
                }
                if (igmp->igmp_type != IGMP_DVMRP)
@@ -513,9 +513,9 @@
                case DVMRP_NEIGHBORS2:
                        if (src != target_addr) {
                                fprintf(stderr, "mrinfo: got reply from %s",
-                                       inet_fmt(src, s1, sizeof(s1)));
+                                       inet_fmt(src));
                                fprintf(stderr, " instead of %s\n",
-                                       inet_fmt(target_addr, s1, sizeof(s1)));
+                                       inet_fmt(target_addr));
                                /*continue;*/
                        }
                        break;