 @@ -1,14 +1,14 @@
-/*	$NetBSD: odsyntax.c,v 1.26 2010/02/09 14:06:37 drochner Exp $	*/
+/*	$NetBSD: odsyntax.c,v 1.27 2010/11/27 00:42:58 dholland Exp $	*/
 /*-
  * Copyright (c) 1990, 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,27 +28,27 @@
  * 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[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: odsyntax.c,v 1.26 2010/02/09 14:06:37 drochner Exp $");
+__RCSID("$NetBSD: odsyntax.c,v 1.27 2010/11/27 00:42:58 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <util.h>
 #include "hexdump.h"
 @@ -62,26 +62,27 @@ struct odformat {
 	int minwidth;
 };
 struct odaddrformat {
 	char type;
 	char const *format1;
 	char const *format2;
 };
 int odmode;
 static void odoffset(int, char ***);
 static void posixtypes(char const *);
 static void odusage(void);
 void
 odsyntax(int argc, char ***argvp)
+{
 	static char empty[] = "", padding[] = PADDING;
 	int ch;
 	char *p, **argv;
 #define TYPE_OFFSET 7
 	add("\"%07.7_Ao\n\"");
 	add("\"%07.7_ao  \"");
 	odmode = 1;
 @@ -166,27 +167,27 @@ odsyntax(int argc, char ***argvp)
 				errx(1, "%s: bad length value", optarg);
 			break;
 		case 'O':
 			posixtypes("o4");
 			break;
 		case 't':
 			posixtypes(optarg);
 			break;
 		case 'v':
 			vflag = ALL;
 			break;
 		case '?':
 		default:
-			usage();
+			odusage();
+		}
 	if (fshead->nextfs->nextfs == NULL)
 		posixtypes("oS");
 	argc -= optind;
 	*argvp += optind;
 	if (argc)
 		odoffset(argc, argvp);
+}
 /* formats used for -t */
 @@ -236,27 +237,27 @@ posixtypes(char const *type_string)
 				switch(*type_string) {
 				case 'F':
 					nbytes = sizeof(float);
 					break;
 				case 'D':
 					nbytes = sizeof(double);
 					break;
 				case 'L':
 					nbytes = sizeof(long double);
 					break;
 				default:
 					warnx("Bad type-size qualifier '%c'",
 					    *type_string);
-					usage();
+					odusage();
+				}
 				type_string++;
 			} else if (isdigit((unsigned char)*type_string)) {
 				nbytes = strtol(type_string, &tmp, 10);
 				type_string = tmp;
 			} else
 				nbytes = 8;
 			break;
 		case 'd':
 		case 'o':
 		case 'u':
 		case 'x':
 			if (isupper((unsigned char)*type_string)) {
 @@ -266,37 +267,37 @@ posixtypes(char const *type_string)
 					break;
 				case 'S':
 					nbytes = sizeof(short);
 					break;
 				case 'I':
 					nbytes = sizeof(int);
 					break;
 				case 'L':
 					nbytes = sizeof(long);
 					break;
 				default:
 					warnx("Bad type-size qualifier '%c'",
 					    *type_string);
-					usage();
+					odusage();
+				}
 				type_string++;
 			} else if (isdigit((unsigned char)*type_string)) {
 				nbytes = strtol(type_string, &tmp, 10);
 				type_string = tmp;
 			} else
 				nbytes = 4;
 			break;
 		default:
-			usage();
+			odusage();
+		}
 		for (odf = odftab; odf->type != 0; odf++)
 			if (odf->type == type && odf->nbytes == nbytes)
 				break;
 		if (odf->type == 0)
 			errx(1, "%c%d: format not supported", type, nbytes);
 		(void)easprintf(&fmt, "%d/%d  \"%*s%s \" \"\\n\"",
 / nbytes, nbytes,
 * nbytes - odf->minwidth, "", odf->format);
 		add(fmt);
+	}
+}
 @@ -386,13 +387,22 @@ odoffset(int argc, char ***argvp)
 	 * is changed as well.  This isn't pretty, but it's easy.
 	 */
 	if (base == 16) {
 		fshead->nextfu->fmt[TYPE_OFFSET] = 'x';
 		fshead->nextfs->nextfu->fmt[TYPE_OFFSET] = 'x';
 	} else if (base == 10) {
 		fshead->nextfu->fmt[TYPE_OFFSET] = 'd';
 		fshead->nextfs->nextfu->fmt[TYPE_OFFSET] = 'd';
+	}
 	/* Terminate file list. */
 	(*argvp)[1] = NULL;
+}
 static void
 odusage(void)
+{
 	(void)warnx("Usage: od [-aBbcDdeFfHhIiLlOovXx] [-A base] [-j skip]"
 		    " [-N length]");
 	(void)warnx("   [-t type_string] [[+]offset[.][Bb]] [file ...]");
 	exit(1);
+}