[src/netbsd-1-4]: src/usr.bin Pull up revision 1.5 (requested by he):

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

details:   https://anonhg.NetBSD.org/src/rev/4a832d7de09d
branches:  netbsd-1-4
changeset: 471095:4a832d7de09d
user:      he <he%NetBSD.org@localhost>
date:      Thu Oct 19 16:32:48 2000 +0000

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

diffstat:

 usr.bin/shlock/shlock.c |  8 ++++----
 usr.bin/tail/extern.h   |  5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r c4b38b84160b -r 4a832d7de09d usr.bin/shlock/shlock.c
--- a/usr.bin/shlock/shlock.c   Thu Oct 19 16:32:42 2000 +0000
+++ b/usr.bin/shlock/shlock.c   Thu Oct 19 16:32:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shlock.c,v 1.4 1998/12/19 22:14:30 christos Exp $      */
+/*     $NetBSD: shlock.c,v 1.4.2.1 2000/10/19 16:32:48 he Exp $        */
 
 /*
 ** Program to produce reliable locks for shell scripts.
@@ -55,9 +55,9 @@
 
 int    Debug = FALSE;
 char   *Pname;
-char   *USAGE = "%s: USAGE: shlock -f file -p pid [-d][-u]\n";
-char   *E_unlk = "%s: unlink(%s): %s\n";
-char   *E_open = "%s: open(%s): %s\n";
+const char USAGE[] = "%s: USAGE: shlock -f file -p pid [-d][-u]\n";
+const char E_unlk[] = "%s: unlink(%s): %s\n";
+const char E_open[] = "%s: open(%s): %s\n";
 
 #define        dprintf if (Debug) printf
 
diff -r c4b38b84160b -r 4a832d7de09d usr.bin/tail/extern.h
--- a/usr.bin/tail/extern.h     Thu Oct 19 16:32:42 2000 +0000
+++ b/usr.bin/tail/extern.h     Thu Oct 19 16:32:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.3.8.1 1999/08/20 05:36:16 cgd Exp $       */
+/*     $NetBSD: extern.h,v 1.3.8.2 2000/10/19 16:32:50 he Exp $        */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -47,7 +47,8 @@
 int bytes __P((FILE *, off_t));
 int lines __P((FILE *, off_t));
 
-void err __P((int fatal, const char *fmt, ...));
+void err __P((int fatal, const char *fmt, ...))
+     __attribute__((__format__(__printf__, 2, 3)));
 void ierr __P((void));
 void oerr __P((void));