Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 14:55:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "libc: Add support for vsnprintf()" into integration

Browse source
This commit is contained in:
Mark Dykes 2020-09-11 18:42:23 +00:00 • committed by TrustedFirmware Code Review
commit ddf04313dc
2 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/lib/libc/stdio.h
View file

@ -22,6 +22,7 @@ int snprintf(char *s, size_t n, const char *fmt, ...) __printflike(3, 4);
#ifdef STDARG_H #ifdef STDARG_H
int vprintf(const char *fmt, va_list args); int vprintf(const char *fmt, va_list args);
int vsnprintf(char *s, size_t n, const char *fmt, va_list args);
#endif #endif
int putchar(int c); int putchar(int c);

44
lib/libc/snprintf.c
View file

@ -77,7 +77,7 @@ static void unsigned_num_print(char **s, size_t n, size_t *chars_printed,
} }
/******************************************************************* /*******************************************************************
* Reduced snprintf to be used for Trusted firmware. * Reduced vsnprintf to be used for Trusted firmware.
* The following type specifiers are supported: * The following type specifiers are supported:
* *
* %x (or %X) - hexadecimal format * %x (or %X) - hexadecimal format
@ -97,9 +97,8 @@ static void unsigned_num_print(char **s, size_t n, size_t *chars_printed,
* buffer was big enough. If it returns a value lower than n, the * buffer was big enough. If it returns a value lower than n, the
* whole string has been written. * whole string has been written.
*******************************************************************/ *******************************************************************/
int snprintf(char *s, size_t n, const char *fmt, ...) int vsnprintf(char *s, size_t n, const char *fmt, va_list args)
{ {
va_list args;
int num; int num;
unsigned long long int unum; unsigned long long int unum;
char *str; char *str;
@ -120,7 +119,6 @@ int snprintf(char *s, size_t n, const char *fmt, ...)
n--; n--;
} }
va_start(args, fmt);
while (*fmt != '\0') { while (*fmt != '\0') {
left = false; left = false;
padc ='\0'; padc ='\0';
@ -221,10 +219,42 @@ loop:
chars_printed++; chars_printed++;
} }
va_end(args); if (n > 0U) {
if (n > 0U)
*s = '\0'; *s = '\0';
}
return (int)chars_printed; return (int)chars_printed;
} }
/*******************************************************************
* Reduced snprintf to be used for Trusted firmware.
* The following type specifiers are supported:
*
* %x (or %X) - hexadecimal format
* %d or %i - signed decimal format
* %s - string format
* %u - unsigned decimal format
* %p - pointer format
*
* The following padding specifiers are supported by this print
* %0NN - Left-pad the number with 0s (NN is a decimal number)
* %NN - Left-pad the number or string with spaces (NN is a decimal number)
* %-NN - Right-pad the number or string with spaces (NN is a decimal number)
*
* The function panics on all other formats specifiers.
*
* It returns the number of characters that would be written if the
* buffer was big enough. If it returns a value lower than n, the
* whole string has been written.
*******************************************************************/
int snprintf(char *s, size_t n, const char *fmt, ...)
{
int count;
va_list all_args;
va_start(all_args, fmt);
count = vsnprintf(s, n, fmt, all_args);
va_end(all_args);
return count;
}