proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 05:27:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/printf: fix some random warnings

Browse Source 
Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2019-05-12 21:10:10 +02:00
parent 5c25bd87b5
commit 60f1101d29
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/printf/vfprintf.c
View File

@ -110,7 +110,7 @@ __wcsconv(wchar_t *wcsarg, int prec)
for (;;) { for (;;) {
clen = wcrtomb(buf, *p++, &mbs); clen = wcrtomb(buf, *p++, &mbs);
if (clen == 0 || clen == (size_t)-1 || if (clen == 0 || clen == (size_t)-1 ||
nbytes + clen > prec) nbytes + clen > (size_t)prec)
break; break;
nbytes += clen; nbytes += clen;
} }
@ -149,10 +149,10 @@ __wcsconv(wchar_t *wcsarg, int prec)
ssize_t ssize_t
vbprintfrr(struct fbuf *cb, const char *fmt0, va_list ap) vbprintfrr(struct fbuf *cb, const char *fmt0, va_list ap)
{ {
char *fmt; /* format string */ const char *fmt; /* format string */
int ch; /* character from fmt */ int ch; /* character from fmt */
int n, n2; /* handy integer (short term usage) */ int n, n2; /* handy integer (short term usage) */
char *cp; /* handy char pointer (short term usage) */ const char *cp; /* handy char pointer (short term usage) */
int flags; /* flags as above */ int flags; /* flags as above */
int ret; /* return value accumulator */ int ret; /* return value accumulator */
int width; /* width from format (%8d), or 0 */ int width; /* width from format (%8d), or 0 */
@ -160,8 +160,8 @@ vbprintfrr(struct fbuf *cb, const char *fmt0, va_list ap)
int saved_errno; int saved_errno;
char sign; /* sign prefix (' ', '+', '-', or \0) */ char sign; /* sign prefix (' ', '+', '-', or \0) */
u_long ulval; /* integer arguments %[diouxX] */ u_long ulval = 0; /* integer arguments %[diouxX] */
uintmax_t ujval; /* %j, %ll, %q, %t, %z integers */ uintmax_t ujval = 0; /* %j, %ll, %q, %t, %z integers */
int base; /* base for [diouxX] conversion */ int base; /* base for [diouxX] conversion */
int dprec; /* a copy of prec if [diouxX], 0 otherwise */ int dprec; /* a copy of prec if [diouxX], 0 otherwise */
int realsz; /* field size expanded by dprec, sign, etc */ int realsz; /* field size expanded by dprec, sign, etc */
@ -260,6 +260,7 @@ vbprintfrr(struct fbuf *cb, const char *fmt0, va_list ap)
val = GETARG (int); \ val = GETARG (int); \
} }
xdigs = xdigs_lower;
saved_errno = errno; saved_errno = errno;
convbuf = NULL; convbuf = NULL;
fmt = (char *)fmt0; fmt = (char *)fmt0;
@ -419,7 +420,8 @@ reswitch: switch (ch) {
} else } else
#endif /* WCHAR_SUPPORT */ #endif /* WCHAR_SUPPORT */
{ {
*(cp = buf) = GETARG(int); buf[0] = GETARG(int);
cp = buf;
size = 1; size = 1;
} }
sign = '\0'; sign = '\0';
@ -608,12 +610,12 @@ number: if ((dprec = prec) >= 0)
if (flags & INTMAX_SIZE) { if (flags & INTMAX_SIZE) {
if (ujval != 0 || prec != 0 || if (ujval != 0 || prec != 0 ||
(flags & ALT && base == 8)) (flags & ALT && base == 8))
cp = __ujtoa(ujval, cp, base, cp = __ujtoa(ujval, buf + BUF, base,
flags & ALT, xdigs); flags & ALT, xdigs);
} else { } else {
if (ulval != 0 || prec != 0 || if (ulval != 0 || prec != 0 ||
(flags & ALT && base == 8)) (flags & ALT && base == 8))
cp = __ultoa(ulval, cp, base, cp = __ultoa(ulval, buf + BUF, base,
flags & ALT, xdigs); flags & ALT, xdigs);
} }
size = buf + BUF - cp; size = buf + BUF - cp;
@ -624,8 +626,8 @@ number: if ((dprec = prec) >= 0)
if (ch == '\0') if (ch == '\0')
goto done; goto done;
/* pretend it was %c with argument ch */ /* pretend it was %c with argument ch */
buf[0] = ch;
cp = buf; cp = buf;
*cp = ch;
size = 1; size = 1;
sign = '\0'; sign = '\0';
break; break;