From: Bruno Haible <bruno@clisp.org>
Date: Sun, 7 Dec 2025 21:19:35 +0000 (+0100)
Subject: argp: Replace some 'continue;' statements with if/else.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=635dbdcf501d52d2e42daf6b44261af9ce2dfe38;p=thirdparty%2Fgnulib.git

argp: Replace some 'continue;' statements with if/else.

* lib/argp-help.c (validate_uparams): Use if/else instead of
'continue;'.
---

diff --git a/ChangeLog b/ChangeLog
index 42163d2c83..ab93efe052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-12-07  Bruno Haible  <bruno@clisp.org>
+
+	argp: Replace some 'continue;' statements with if/else.
+	* lib/argp-help.c (validate_uparams): Use if/else instead of
+	'continue;'.
+
 2025-12-07  G. Branden Robinson  <g.branden.robinson@gmail.com>
 
 	doc: Fix a typo.
diff --git a/lib/argp-help.c b/lib/argp-help.c
index 5bf4d3aacf..d0ac0a5fa5 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -140,19 +140,18 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr)
 
   for (up = uparam_names; up < uparam_names + nuparam_names; up++)
     {
-      if (up->is_bool
-          || up->uparams_offs == offsetof (struct uparams, rmargin))
-        continue;
-      if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
-        {
-          __argp_failure (state, 0, 0,
-                          dgettext (state == NULL ? NULL
-                                    : state->root_argp->argp_domain,
-                                    "\
+      if (!(up->is_bool
+            || up->uparams_offs == offsetof (struct uparams, rmargin)))
+        if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
+          {
+            __argp_failure (state, 0, 0,
+                            dgettext (state == NULL ? NULL
+                                      : state->root_argp->argp_domain,
+                                      "\
 ARGP_HELP_FMT: %s value is less than or equal to %s"),
-                          "rmargin", up->name);
-          return;
-        }
+                            "rmargin", up->name);
+            return;
+          }
     }
   uparams = *upptr;
   uparams.valid = 1;