]> Gentwo Git Trees - linux/.git/commitdiff
lib/vsprintf: Unify FORMAT_STATE_NUM handlers
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 20 Nov 2025 08:31:40 +0000 (09:31 +0100)
committerPetr Mladek <pmladek@suse.com>
Mon, 24 Nov 2025 15:10:11 +0000 (16:10 +0100)
We have two almost identical pieces that handle FORMAT_STATE_NUM case.
The differences are:
- redundant {} for one-line if-else conditional
- missing blank line after variable definitions
- inverted conditional

Unify the style of two.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Link: https://patch.msgid.link/20251120083140.3478507-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
lib/vsprintf.c

index 11dbf1023391a5a518e896bd552d4670b8b0ab48..0dffc7224d41353e3338f76df61a17f52024286a 100644 (file)
@@ -2877,10 +2877,11 @@ int vsnprintf(char *buf, size_t size, const char *fmt_str, va_list args)
 
                case FORMAT_STATE_NUM: {
                        unsigned long long num;
-                       if (fmt.size <= sizeof(int))
-                               num = convert_num_spec(va_arg(args, int), fmt.size, spec);
-                       else
+
+                       if (fmt.size > sizeof(int))
                                num = va_arg(args, long long);
+                       else
+                               num = convert_num_spec(va_arg(args, int), fmt.size, spec);
                        str = number(str, end, num, spec);
                        continue;
                }
@@ -3388,11 +3389,10 @@ int bstr_printf(char *buf, size_t size, const char *fmt_str, const u32 *bin_buf)
                        goto out;
 
                case FORMAT_STATE_NUM:
-                       if (fmt.size > sizeof(int)) {
+                       if (fmt.size > sizeof(int))
                                num = get_arg(long long);
-                       } else {
+                       else
                                num = convert_num_spec(get_arg(int), fmt.size, spec);
-                       }
                        str = number(str, end, num, spec);
                        continue;
                }