diff options
| author | Jacob Garber <jgarber1@ualberta.ca> | 2019-06-25 16:55:52 -0600 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-07-23 09:09:45 +0000 |
| commit | c3feebb7f525123a8e36135314838b5a9c811f3b (patch) | |
| tree | 9279d7b6db6eead03d37bd0021164763ca9bdee2 | |
| parent | 768db4f5ca93d4dad1f5104e1a3676c40ad85a55 (diff) | |
libpayload/libc: Tidy utf16le_to_ascii
- Constify the string argument
- Change int to size_t, which is what xmalloc expects
Change-Id: I8b5a13319ded4025f883760f2b6d4d7a9ad9fb8b
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33793
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | payloads/libpayload/include/string.h | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libc/string.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/payloads/libpayload/include/string.h b/payloads/libpayload/include/string.h index 4aff0e8994..52379a034d 100644 --- a/payloads/libpayload/include/string.h +++ b/payloads/libpayload/include/string.h @@ -73,7 +73,7 @@ char *strerror(int errnum); * @defgroup string Unicode functions * @{ */ -char *utf16le_to_ascii(uint16_t *utf16_string, int maxlen); +char *utf16le_to_ascii(const uint16_t *utf16_string, size_t maxlen); /** @} */ /** diff --git a/payloads/libpayload/libc/string.c b/payloads/libpayload/libc/string.c index 9a5a1ea4c1..fd88a88ad2 100644 --- a/payloads/libpayload/libc/string.c +++ b/payloads/libpayload/libc/string.c @@ -645,12 +645,11 @@ char *strerror(int errnum) * @param maxlen Maximum possible length of the string in code points * @return Newly allocated ASCII string */ -char *utf16le_to_ascii(uint16_t *utf16_string, int maxlen) +char *utf16le_to_ascii(const uint16_t *utf16_string, size_t maxlen) { char *ascii_string = xmalloc(maxlen + 1); /* +1 for trailing \0 */ ascii_string[maxlen] = '\0'; - int i; - for (i = 0; i < maxlen; i++) { + for (size_t i = 0; i < maxlen; i++) { uint16_t wchar = utf16_string[i]; ascii_string[i] = wchar > 0x7f ? '?' : (char)wchar; } |