From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 21 Jan 2015 18:28:40 +0000 (-0500)
Subject: simplify part of getopt_long
X-Git-Tag: v1.1.7~77
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63cac4e29a61487423f63bed9150aa9aec906823;p=oweals%2Fmusl.git

simplify part of getopt_long

as a result of commit e8e4e56a8ce1f3d7e4a027ff5478f2f8ea70c46b,
the later code path for setting optarg to a null pointer is no longer
necessary, and removing it eliminates an indention level and arguably
makes the code more readable.
---

diff --git a/src/misc/getopt_long.c b/src/misc/getopt_long.c
index bee77f43..480c0013 100644
--- a/src/misc/getopt_long.c
+++ b/src/misc/getopt_long.c
@@ -87,19 +87,17 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
 					return '?';
 				}
 				optarg = opt+1;
-			} else {
-				if (longopts[i].has_arg == required_argument) {
-					if (!(optarg = argv[optind])) {
-						if (colon) return ':';
-						if (!opterr) return '?';
-						__getopt_msg(argv[0],
-							": option requires an argument: ",
-							longopts[i].name,
-							strlen(longopts[i].name));
-						return '?';
-					}
-					optind++;
-				} else optarg = NULL;
+			} else if (longopts[i].has_arg == required_argument) {
+				if (!(optarg = argv[optind])) {
+					if (colon) return ':';
+					if (!opterr) return '?';
+					__getopt_msg(argv[0],
+						": option requires an argument: ",
+						longopts[i].name,
+						strlen(longopts[i].name));
+					return '?';
+				}
+				optind++;
 			}
 			if (idx) *idx = i;
 			if (longopts[i].flag) {