[src/netbsd-1-4]: src/usr.sbin/mrinfo Pull up revision 1.8 (requested by he):

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

details:   https://anonhg.NetBSD.org/src/rev/b9759fb12a36
branches:  netbsd-1-4
changeset: 471131:b9759fb12a36
user:      he <he%NetBSD.org@localhost>
date:      Thu Oct 19 17:05:26 2000 +0000

description:
Pull up revision 1.8 (requested by he):
  Format string cleanup.

diffstat:

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

diffs (39 lines):

diff -r 41c5744d8592 -r b9759fb12a36 usr.sbin/mrinfo/mrinfo.c
--- a/usr.sbin/mrinfo/mrinfo.c  Thu Oct 19 17:05:24 2000 +0000
+++ b/usr.sbin/mrinfo/mrinfo.c  Thu Oct 19 17:05:26 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mrinfo.c,v 1.7 1998/07/04 21:31:59 mrg Exp $   */
+/*     $NetBSD: mrinfo.c,v 1.7.2.1 2000/10/19 17:05:26 he Exp $        */
 
 /*
  * This tool requests configuration info from a multicast router
@@ -67,7 +67,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.7 1998/07/04 21:31:59 mrg Exp $");
+__RCSID("$NetBSD: mrinfo.c,v 1.7.2.1 2000/10/19 17:05:26 he Exp $");
 #endif
 #endif
 
@@ -104,6 +104,10 @@
 
 /* to shut up -Wstrict-prototypes */
 int                    main __P((int argc, char *argv[]));
+#ifdef __STDC__
+void log(int severity, int syserr, char *format, ...)
+       __attribute__((__format__(__printf__, 3, 4)));
+#endif
 
 
 char   *
@@ -164,7 +168,8 @@
                if (severity == LOG_WARNING)
                        strcat(fmt, "warning - ");
                strncat(fmt, format, 80);
-               vfprintf(stderr, fmt, ap);
+               format = fmt;
+               vfprintf(stderr, format, ap);
                if (syserr == 0)
                        fprintf(stderr, "\n");
                else