From 6b4944ecedbb5d5d870233c314604f292146ca85 Mon Sep 17 00:00:00 2001
From: Bill Meier <wmeier@newsguy.com>
Date: Tue, 31 Dec 2013 16:17:09 +0000
Subject: Follow convention for -h option:   Output to stdout & then exit(0).
 Add editor modelines.

svn path=/trunk/; revision=54513
---
 randpkt.c | 53 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 15 deletions(-)

(limited to 'randpkt.c')

diff --git a/randpkt.c b/randpkt.c
index e1695a2caa..ad391c400d 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -487,7 +487,7 @@ pkt_example examples[] = {
 
 
 static int parse_type(char *string);
-static void usage(void);
+static void usage(gboolean is_error);
 static void seed(void);
 
 static pkt_example* find_example(int type);
@@ -535,8 +535,10 @@ main(int argc, char **argv)
 				break;
 
 			case 'h':
+				usage(FALSE);
+				break;
 			default:
-				usage();
+				usage(TRUE);
 				break;
 		}
 	}
@@ -546,7 +548,7 @@ main(int argc, char **argv)
 		produce_filename = argv[optind];
 	}
 	else {
-		usage();
+		usage(TRUE);
 	}
 
 	example = find_example(produce_type);
@@ -627,24 +629,32 @@ main(int argc, char **argv)
 }
 
 /* Print usage statement and exit program */
-static
-void usage(void)
+static void
+usage(gboolean is_error)
 {
-	int	num_entries = array_length(examples);
-	int	i;
+	FILE 	*output;
+	int	 num_entries = array_length(examples);
+	int	 i;
 
-	printf("Usage: randpkt [-b maxbytes] [-c count] [-t type] filename\n");
-	printf("Default max bytes (per packet) is 5000\n");
-	printf("Default count is 1000.\n");
-	printf("Types:\n");
+	if (!is_error) {
+		output = stdout;
+	}
+	else {
+		output = stderr;
+	}
+
+	fprintf(output, "Usage: randpkt [-b maxbytes] [-c count] [-t type] filename\n");
+	fprintf(output, "Default max bytes (per packet) is 5000\n");
+	fprintf(output, "Default count is 1000.\n");
+	fprintf(output, "Types:\n");
 
 	for (i = 0; i < num_entries; i++) {
-		printf("\t%-16s%s\n", examples[i].abbrev, examples[i].longname);
+		fprintf(output, "\t%-16s%s\n", examples[i].abbrev, examples[i].longname);
 	}
 
-	printf("\n");
+	fprintf(output, "\n");
 
-	exit(0);
+	exit(is_error ? 1 : 0);
 }
 
 /* Parse command-line option "type" and return enum type */
@@ -689,7 +699,7 @@ void
 seed(void)
 {
 	unsigned int	randomness;
-	time_t now;
+	time_t		now;
 #ifndef _WIN32
 	int 		fd;
 	ssize_t		ret;
@@ -737,3 +747,16 @@ fallback:
 
 	srand(randomness);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
-- 
cgit v1.2.1