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/ubirmvol.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

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

diff --git a/ubi-utils/src/ubirmvol.c b/ubi-utils/src/ubirmvol.c
index 04ec085..f458e8a 100644
--- a/ubi-utils/src/ubirmvol.c
+++ b/ubi-utils/src/ubirmvol.c
@@ -24,6 +24,7 @@
  *
  * 1.1 Reworked the userinterface to use argp.
  * 1.2 Removed argp because we want to use uClibc.
+ * 1.3 Minor cleanups
  */
 
 #include <stdio.h>
@@ -36,10 +37,7 @@
 #include <config.h>
 #include <libubi.h>
 
-#define PROGRAM_VERSION "1.2"
-
-extern char *optarg;
-extern int optind;
+#define PROGRAM_VERSION "1.3"
 
 /*
  * The below variables are set by command line options.
@@ -91,14 +89,12 @@ struct option long_options[] = {
 /*
  * @brief Parse the arguments passed into the test case.
  *
- * @param key		 The parameter.
- * @param arg		 Argument passed to parameter.
- * @param state		 Location to put information on parameters.
+ * @param argc		 The number of arguments
+ * @param argv		 The list of arguments
+ * @param args		 Pointer to argument structure
  *
  * @return error
  *
- * Get the `input' argument from `argp_parse', which we know is a
- * pointer to our arguments structure.
  */
 static int
 parse_opt(int argc, char **argv, struct args *args)
@@ -115,9 +111,11 @@ parse_opt(int argc, char **argv, struct args *args)
 		switch (key) {
 			case 'd': /* --devn=<device number> */
 				args->devn = strtoul(optarg, &endp, 0);
-				if (*endp != '\0' || endp == optarg || args->devn < 0) {
-					fprintf(stderr, "Bad UBI device number: "
-							"\"%s\"\n", optarg);
+				if (*endp != '\0' || endp == optarg ||
+					args->devn < 0) {
+					fprintf(stderr,
+						"Bad UBI device number: "
+						"\"%s\"\n", optarg);
 					goto out;
 				}
 				break;
@@ -135,7 +133,8 @@ parse_opt(int argc, char **argv, struct args *args)
 				fprintf(stderr, "Parameter is missing\n");
 				goto out;
 			case '?': /* help */
-				fprintf(stderr, "Usage: ubirmvol [OPTION...]\n");
+				fprintf(stderr,
+					"Usage: ubirmvol [OPTION...]\n");
 				fprintf(stderr, "%s", doc);
 				fprintf(stderr, "%s", optionsstr);
 				fprintf(stderr, "\nReport bugs to %s\n",
-- 
cgit v1.2.3