File acpidump-cleanup.diff of Package pmtools

--- acpidump/acpidump.c
+++ acpidump/acpidump.c
@@ -406,13 +406,13 @@ static void usage(const char *progname)
 }
 
 static struct option long_options[] = {
-	{"addr", 1, 0, 0},
-	{"table", 1, 0, 0},
-	{"output", 1, 0, 0},
-	{"binary", 0, 0, 0},
-	{"length", 1, 0, 0},
-	{"skip", 1, 0, 0},
-	{"help", 0, 0, 0},
+	{"addr", 1, 0, 'a'},
+	{"table", 1, 0, 't'},
+	{"output", 1, 0, 'o'},
+	{"binary", 0, 0, 'b'},
+	{"length", 1, 0, 'l'},
+	{"skip", 1, 0, 's'},
+	{"help", 0, 0, 'h'},
 	{0, 0, 0, 0}
 };
 int main(int argc, char **argv)
@@ -428,38 +428,12 @@ int main(int argc, char **argv)
 	addr = length = 0;
 	skip = 0;
 	while (1) {
-		option_index = 0;
 		c = getopt_long(argc, argv, "a:t:o:bl:s:h",
 				    long_options, &option_index);
 		if (c == -1)
 			break;
 
 		switch (c) {
-		case 0:
-			switch (option_index) {
-			case 0:
-				addr = strtoul(optarg, (char **)NULL, 16);
-				break;
-			case 1:
-				memcpy(select_sig, optarg, 4);
-				break;
-			case 2:
-				filename = optarg;
-				break;
-			case 3:
-				print = 0;
-				break;
-			case 4:
-				length = strtoul(optarg, (char **)NULL, 16);
-				break;
-			case 5:
-				skip = strtoul(optarg, (char **)NULL, 10);
-				break;
-			case 6:
-				usage(argv[0]);
-				exit(0);
-			}
-			break;
 		case 'a':
 			addr = strtoul(optarg, (char **)NULL, 16);
 			break;