[PATCH] stdio-common/printf-prs.c: Simplify test

[Alejandro Colomar]

The test was being repeated for all the remaining code in the for loop.
Test once, and 'continue' to next iteration if necessary, so that the
following code can assume that the necessary condition is met.

Minor changes: fix some mixed tabs & spaces to use spaces only.

Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
---
 stdio-common/printf-prs.c | 44 ++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index 1d4e00553d..a0c5c5487b 100644
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -72,30 +72,32 @@ parse_printf_format (const char *fmt, size_t n, int *argtypes)
       /* Parse this spec.  */
       nargs += __parse_one_specmb (f, nargs, &spec, &max_ref_arg);
 
+      if ((size_t) spec.width_arg >= n)
+        continue;
+
       /* If the width is determined by an argument this is an int.  */
-      if (spec.width_arg != -1 && (size_t) spec.width_arg < n)
-	argtypes[spec.width_arg] = PA_INT;
+      if (spec.width_arg != -1)
+        argtypes[spec.width_arg] = PA_INT;
 
       /* If the precision is determined by an argument this is an int.  */
-      if (spec.prec_arg != -1 && (size_t) spec.prec_arg < n)
-	argtypes[spec.prec_arg] = PA_INT;
-
-      if ((size_t) spec.data_arg < n)
-	switch (spec.ndata_args)
-	  {
-	  case 0:		/* No arguments.  */
-	    break;
-	  case 1:		/* One argument; we already have the type.  */
-	    argtypes[spec.data_arg] = spec.data_arg_type;
-	    break;
-	  default:
-	    /* We have more than one argument for this format spec.  We must
-               call the arginfo function again to determine all the types.  */
-	    (void) (*__printf_arginfo_table[spec.info.spec])
-	      (&spec.info, n - spec.data_arg, &argtypes[spec.data_arg],
-	       &spec.size);
-	    break;
-	  }
+      if (spec.prec_arg != -1)
+        argtypes[spec.prec_arg] = PA_INT;
+
+      switch (spec.ndata_args)
+        {
+        case 0:		/* No arguments.  */
+          break;
+        case 1:		/* One argument; we already have the type.  */
+          argtypes[spec.data_arg] = spec.data_arg_type;
+          break;
+        default:
+          /* We have more than one argument for this format spec.  We must
+             call the arginfo function again to determine all the types.  */
+          (void) (*__printf_arginfo_table[spec.info.spec])
+            (&spec.info, n - spec.data_arg, &argtypes[spec.data_arg],
+             &spec.size);
+          break;
+        }
     }
 
   return MAX (nargs, max_ref_arg);
-- 
2.31.0