 @@ -1,14 +1,14 @@
-/*	$NetBSD: display.c,v 1.22 2013/10/18 20:19:03 christos Exp $	*/
+/*	$NetBSD: display.c,v 1.23 2016/03/04 02:46:19 dholland Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,50 +28,51 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if !defined(lint)
 #if 0
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: display.c,v 1.22 2013/10/18 20:19:03 christos Exp $");
+__RCSID("$NetBSD: display.c,v 1.23 2016/03/04 02:46:19 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include "hexdump.h"
 enum _vflag vflag = FIRST;
 static off_t address;			/* address/offset in stream */
 static off_t eaddress;			/* end address */
 static u_char *get(void);
 static inline void print(PR *, u_char *);
 void
 display(void)
+{
 	FS *fs;
 	FU *fu;
 	PR *pr;
 	int cnt;
 	u_char *bp;
 	off_t saveaddress;
 	u_char savech, *savebp;
 @@ -219,27 +220,27 @@ bpad(PR *pr)
 	 * Remove all conversion flags; '-' is the only one valid
 	 * with %s, and it's not useful here.
 	 */
 	pr->flags = F_BPAD;
 	pr->cchar[0] = 's';
 	pr->cchar[1] = '\0';
 	for (p1 = pr->fmt; *p1 != '%'; ++p1);
 	for (p2 = ++p1; *p1 && strchr(spec, *p1); ++p1);
 	while ((*p2++ = *p1++) != '\0');
+}
 static char **_argv;
-u_char *
+static u_char *
 get(void)
+{
 	static int ateof = 1;
 	static u_char *curp, *savp;
 	int n;
 	int need, nread;
 	u_char *tmpp;
 	if (!curp) {
 		curp = ecalloc(blocksize, 1);
 		savp = ecalloc(blocksize, 1);
 	} else {
 		tmpp = curp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hexdump.h,v 1.13 2011/09/04 20:27:27 joerg Exp $	*/
+/*	$NetBSD: hexdump.h,v 1.14 2016/03/04 02:46:19 dholland Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -77,20 +77,19 @@ extern int exitval;			/* final exit valu
 extern FS *fshead;			/* head of format strings list */
 extern int length;			/* max bytes to read */
 extern off_t skip;			/* bytes to skip */
 extern enum _vflag vflag;
 void	 add(const char *);
 void	 addfile(char *);
 void	 bpad(PR *);
 void	 conv_c(PR *, u_char *);
 void	 conv_u(PR *, u_char *);
 void	 display(void);
 void	 doskip(const char *, int);
 void	 escape(char *);
 u_char	*get(void);
 void	 hexsyntax(int, char ***);
 int	 next(char **);
 void	 odsyntax(int, char ***);
 void	 rewrite(FS *);
 int	 size(FS *);
 void	 usage(void) __attribute__((__noreturn__));