Update upstream source from tag 'upstream/3.24'

Update to upstream version '3.24'
with Debian dir 0a6e08a83f1f2a2aa8e726c19c24ed27cb08f134

1 files changed, 13 insertions, 15 deletions

diff --git a/src/opt.c b/src/opt.c
index d64e521..8efbf52 100644
--- a/src/opt.c
+++ b/src/opt.c
@@ -304,22 +304,20 @@ static void opt_to_text(const struct HXoption *opt, char *buf, size_t len,
 		buf[i++] = opt->sh;
 		if (!takes_void(opt->type))
 			i += snprintf(buf + i, len - i, " %s", htyp);
+	} else if (opt->sh == '\0') {
+		if (takes_void(opt->type))
+			i += snprintf(buf + i, len - i,
+			     "--%s", opt->ln);
+		else
+			i += snprintf(buf + i, len - i,
+			     "--%s=%s", opt->ln, htyp);
 	} else {
-		if (opt->sh == '\0') {
-			if (takes_void(opt->type))
-				i += snprintf(buf + i, len - i,
-				     "--%s", opt->ln);
-			else
-				i += snprintf(buf + i, len - i,
-				     "--%s=%s", opt->ln, htyp);
-		} else {
-			if (takes_void(opt->type))
-				i += snprintf(buf + i, len - i, "-%c%s--%s",
-				     opt->sh, alt, opt->ln);
-			else
-				i += snprintf(buf + i, len - i, "-%c%s--%s%c%s",
-				     opt->sh, alt, opt->ln, equ, htyp);
-		}
+		if (takes_void(opt->type))
+			i += snprintf(buf + i, len - i, "-%c%s--%s",
+			     opt->sh, alt, opt->ln);
+		else
+			i += snprintf(buf + i, len - i, "-%c%s--%s%c%s",
+			     opt->sh, alt, opt->ln, equ, htyp);
 	}
 
 	if (flags & W_BRACKET)