[src/netbsd-1-5]: src/usr.sbin/config Pullup by patch [is]:

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

details:   https://anonhg.NetBSD.org/src/rev/ec6d119c5b83
branches:  netbsd-1-5
changeset: 489912:ec6d119c5b83
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 18 17:10:55 2000 +0000

description:
Pullup by patch [is]:
String format cleanups from sommerfeld.

diffstat:

 usr.sbin/config/config.h |  36 +++++++++++++++++++++---------------
 usr.sbin/config/util.c   |  15 +++++++++------
 2 files changed, 30 insertions(+), 21 deletions(-)

diffs (86 lines):

diff -r 68c6aafcb34f -r ec6d119c5b83 usr.sbin/config/config.h
--- a/usr.sbin/config/config.h  Wed Oct 18 17:06:00 2000 +0000
+++ b/usr.sbin/config/config.h  Wed Oct 18 17:10:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.h,v 1.47 2000/01/23 23:37:42 hubertf Exp $      */
+/*     $NetBSD: config.h,v 1.47.4.1 2000/10/18 17:10:55 tv Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -82,6 +82,8 @@
 #define        major(x)        ((int)(((u_int)(x) >> 8) & 0xff))
 #define        minor(x)        ((int)((x) & 0xff))
 #define        makedev(x,y)    ((int)(((x) << 8) | (y)))
+
+#define __attribute__(x)
 #endif /* MAKE_BOOTSTRAP */
 
 #define ARRCHR '#'
@@ -432,20 +434,24 @@
 void   initsem __P((void));
 
 /* util.c */
-void   *emalloc __P((size_t));
-void   *erealloc __P((void *, size_t));
-char   *estrdup __P((const char *));
-void   prefix_push __P((const char *));
-void   prefix_pop __P((void));
-char   *sourcepath __P((const char *));
-void   warn __P((const char *, ...));                  /* immediate warns */
-void   error __P((const char *, ...));                 /* immediate errs */
-void   xerror __P((const char *, int, const char *, ...)); /* delayed errs */
-__dead void panic __P((const char *, ...));
-struct nvlist *newnv __P((const char *, const char *, void *, int,
-           struct nvlist *));
-void   nvfree __P((struct nvlist *));
-void   nvfreel __P((struct nvlist *));
+void   *emalloc(size_t);
+void   *erealloc(void *, size_t);
+char   *estrdup(const char *);
+void   prefix_push(const char *);
+void   prefix_pop(void);
+char   *sourcepath(const char *);
+void   warn(const char *, ...)                         /* immediate warns */
+     __attribute__((__format__(__printf__, 1, 2)));    
+void   error(const char *, ...)                        /* immediate errs */
+     __attribute__((__format__(__printf__, 1, 2)));
+void   xerror(const char *, int, const char *, ...)    /* delayed errs */
+     __attribute__((__format__(__printf__, 3, 4)));
+__dead void panic(const char *, ...)
+     __attribute__((__format__(__printf__, 1, 2)));
+struct nvlist *newnv(const char *, const char *, void *, int, struct nvlist *);
+void   nvfree(struct nvlist *);
+void   nvfreel(struct nvlist *);
+
 
 /* liby */
 void   yyerror __P((const char *));
diff -r 68c6aafcb34f -r ec6d119c5b83 usr.sbin/config/util.c
--- a/usr.sbin/config/util.c    Wed Oct 18 17:06:00 2000 +0000
+++ b/usr.sbin/config/util.c    Wed Oct 18 17:10:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.11 2000/01/20 00:08:08 thorpej Exp $        */
+/*     $NetBSD: util.c,v 1.11.4.1 2000/10/18 17:10:55 tv Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -56,11 +56,14 @@
 #include <sys/types.h>
 #include "config.h"
 
-static void nomem __P((void));
-static void vxerror __P((const char *, int, const char *, va_list));
-static void vxwarn __P((const char *, int, const char *, va_list));
-static void vxmsg __P((const char *fname, int line, const char *class, 
-                      const char *fmt, va_list));
+static void nomem(void);
+static void vxerror(const char *, int, const char *, va_list)
+            __attribute__((__format__(__printf__, 3, 0)));
+static void vxwarn(const char *, int, const char *, va_list)
+            __attribute__((__format__(__printf__, 3, 0)));
+static void vxmsg(const char *fname, int line, const char *class, 
+                 const char *fmt, va_list)
+     __attribute__((__format__(__printf__, 4, 0)));
 
 /*
  * Malloc, with abort on error.