1
0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-11-03 04:17:20 -05:00

Feature: Allow %z[ui] in logging format strings

This commit is contained in:
Philipp Schafft 2018-04-28 12:02:31 +00:00
parent 308e73134c
commit fca416b126

View File

@ -473,6 +473,9 @@ static void __vsnprintf(char *str, size_t size, const char *format, va_list ap)
case 'l': case 'l':
block_size++; block_size++;
break; break;
case 'z':
block_size = 'z';
break;
case '.': case '.':
// just ignore '.'. If somebody cares: fix it. // just ignore '.'. If somebody cares: fix it.
break; break;
@ -523,6 +526,13 @@ static void __vsnprintf(char *str, size_t size, const char *format, va_list ap)
else else
snprintf(buf, sizeof(buf), "%lli", (long long int)va_arg(ap, long long int)); snprintf(buf, sizeof(buf), "%lli", (long long int)va_arg(ap, long long int));
break; break;
case 'z':
/* We do not use 'z' type of snprintf() here as it is not safe to use on a few outdated platforms. */
if (*format == 'u')
snprintf(buf, sizeof(buf), "%llu", (unsigned long long int)va_arg(ap, size_t));
else
snprintf(buf, sizeof(buf), "%lli", (long long int)va_arg(ap, ssize_t));
break;
default: default:
snprintf(buf, sizeof(buf), "<<<invalid>>>"); snprintf(buf, sizeof(buf), "<<<invalid>>>");
break; break;