CVS commit: src/usr.bin/hexdump

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Sun Sep  4 20:27:27 UTC 2011

Modified Files:
        src/usr.bin/hexdump: hexdump.h parse.c

Log Message:
static + __dead


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/hexdump/hexdump.h
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/hexdump/parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/hexdump/hexdump.h
diff -u src/usr.bin/hexdump/hexdump.h:1.12 src/usr.bin/hexdump/hexdump.h:1.13
--- src/usr.bin/hexdump/hexdump.h:1.12	Sat Nov 27 20:46:38 2010
+++ src/usr.bin/hexdump/hexdump.h	Sun Sep  4 20:27:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: hexdump.h,v 1.12 2010/11/27 20:46:38 christos Exp $	*/
+/*	$NetBSD: hexdump.h,v 1.13 2011/09/04 20:27:27 joerg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -81,10 +81,6 @@
 
 void	 add(const char *);
 void	 addfile(char *);
-void	 badcnt(char *);
-void	 badconv(char *);
-void	 badfmt(const char *);
-void	 badsfmt(void);
 void	 bpad(PR *);
 void	 conv_c(PR *, u_char *);
 void	 conv_u(PR *, u_char *);

Index: src/usr.bin/hexdump/parse.c
diff -u src/usr.bin/hexdump/parse.c:1.26 src/usr.bin/hexdump/parse.c:1.27
--- src/usr.bin/hexdump/parse.c:1.26	Sun Jan 18 21:34:32 2009
+++ src/usr.bin/hexdump/parse.c	Sun Sep  4 20:27:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.26 2009/01/18 21:34:32 apb Exp $	*/
+/*	$NetBSD: parse.c,v 1.27 2011/09/04 20:27:27 joerg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: parse.c,v 1.26 2009/01/18 21:34:32 apb Exp $");
+__RCSID("$NetBSD: parse.c,v 1.27 2011/09/04 20:27:27 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,6 +57,11 @@
 
 #include "hexdump.h"
 
+__dead static void	 badcnt(char *);
+__dead static void	 badconv(char *);
+__dead static void	 badfmt(const char *);
+__dead static void	 badsfmt(void);
+
 FU *endfu;					/* format at end-of-data */
 
 void
@@ -518,25 +523,25 @@
 	}
 }
 
-void
+static void
 badcnt(char *s)
 {
 	errx(1, "%s: bad byte count", s);
 }
 
-void
+static void
 badsfmt(void)
 {
 	errx(1, "%%s: requires a precision or a byte count");
 }
 
-void
+static void
 badfmt(const char *fmt)
 {
 	errx(1, "\"%s\": bad format", fmt);
 }
 
-void
+static void
 badconv(char *ch)
 {
 	errx(1, "%%%s: bad conversion character", ch);