optimize more integer cases in floatscan; comment the whole procedure

[musl] / src / stdio / vfprintf.c

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index 6766012..b5001ff 100644 (file)
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -570,11 +570,11 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
                case 'u':
                        a = fmt_u(arg.i, z);
                        }
+                       if (p>=0) fl &= ~ZERO_PAD;
                        if (!arg.i && !p) {
                                a=z;
                                break;
                        }
-                       if (p>=0) fl &= ~ZERO_PAD;
                        p = MAX(p, z-a + !arg.i);
                        break;
                case 'c':
@@ -584,7 +584,7 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
                case 'm':
                        if (1) a = strerror(errno); else
                case 's':
-                       a = arg.p;
+                       a = arg.p ? arg.p : "(null)";
                        z = memchr(a, 0, p);
                        if (!z) z=a+p;
                        else p=z-a;