From d45b87985d5371b2e47458ee0666f7979d5a8c21 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.ibm.com>
Date: Tue, 12 Dec 2006 09:22:48 +0100
Subject: [PATCH] Minor ubi utils cleanups

Remove getopt extern declarations

Minor whitespace cleanups

Remove incorrect program names that snuck in during getopt rewrite

Change comments to match reality

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: Frank Haverkamp <haver@vnet.ibm.com>
---
 ubi-utils/src/ubigen.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'ubi-utils/src/ubigen.c')

diff --git a/ubi-utils/src/ubigen.c b/ubi-utils/src/ubigen.c
index 877f469..d99ba2d 100644
--- a/ubi-utils/src/ubigen.c
+++ b/ubi-utils/src/ubigen.c
@@ -22,6 +22,7 @@
  * 1.0 Initial version
  * 1.1 Different CRC32 start value
  * 1.2 Removed argp because we want to use uClibc.
+ * 1.3 Minor cleanups
  */
 
 #include <stdlib.h>
@@ -35,16 +36,13 @@
 #include "ubigen.h"
 #include "config.h"
 
-#define PROGRAM_VERSION "1.2"
+#define PROGRAM_VERSION "1.3"
 
 typedef enum action_t {
 	ACT_NORMAL	     = 0x00000001,
 	ACT_BROKEN_UPDATE    = 0x00000002,
 } action_t;
 
-extern char *optarg;
-extern int optind;
-
 static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
 	BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
 	"\n"
@@ -85,7 +83,7 @@ static const char *optionsstr =
 "  -V, --version              Print program version\n";
 
 static const char *usage =
-"Usage: ubigen.orig [-cdv?V] [-A <num>] [-B <num>] [-E <num>] [-I <num>]\n"
+"Usage: ubigen [-cdv?V] [-A <num>] [-B <num>] [-E <num>] [-I <num>]\n"
 "          [-O <num>] [-T <num>] [-X <num>] [-i <filename>] [-o <filename>]\n"
 "          [-U <leb>] [--copyright] [--debug] [--verbose] [--alignment=<num>]\n"
 "          [--blocksize=<num>] [--erasecount=<num>] [--id=<num>]\n"
-- 
cgit v1.2.3