From e346c7cbc188543cc99655dac7da457c88e5a2d4 Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Wed, 16 Jan 2019 11:18:55 -0800 Subject: exfat: Rename utf conversion symbols These clash with libbase Change-Id: I0e4d8b5bd6820107bacfb794fe0593a240953bbb --- libexfat/exfat.h | 4 ++-- libexfat/lookup.c | 4 ++-- libexfat/node.c | 4 ++-- libexfat/utf.c | 4 ++-- libexfat/utils.c | 2 +- mkfs/main.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libexfat/exfat.h b/libexfat/exfat.h index 2342be4..d6209a3 100644 --- a/libexfat/exfat.h +++ b/libexfat/exfat.h @@ -202,9 +202,9 @@ void exfat_humanize_bytes(uint64_t value, struct exfat_human_bytes* hb); void exfat_print_info(const struct exfat_super_block* sb, uint32_t free_clusters); -int utf16_to_utf8(char* output, const le16_t* input, size_t outsize, +int exfat_utf16_to_utf8(char* output, const le16_t* input, size_t outsize, size_t insize); -int utf8_to_utf16(le16_t* output, const char* input, size_t outsize, +int exfat_utf8_to_utf16(le16_t* output, const char* input, size_t outsize, size_t insize); size_t utf16_length(const le16_t* str); diff --git a/libexfat/lookup.c b/libexfat/lookup.c index 23aa141..50ad31f 100644 --- a/libexfat/lookup.c +++ b/libexfat/lookup.c @@ -86,7 +86,7 @@ static int lookup_name(struct exfat* ef, struct exfat_node* parent, *node = NULL; - rc = utf8_to_utf16(buffer, name, EXFAT_NAME_MAX + 1, n); + rc = exfat_utf8_to_utf16(buffer, name, EXFAT_NAME_MAX + 1, n); if (rc != 0) return rc; @@ -194,7 +194,7 @@ int exfat_split(struct exfat* ef, struct exfat_node** parent, exfat_put_node(ef, *parent); return -ENOENT; } - rc = utf8_to_utf16(name, p, EXFAT_NAME_MAX + 1, n); + rc = exfat_utf8_to_utf16(name, p, EXFAT_NAME_MAX + 1, n); if (rc != 0) { exfat_put_node(ef, *parent); diff --git a/libexfat/node.c b/libexfat/node.c index ab1d7d6..eea7992 100644 --- a/libexfat/node.c +++ b/libexfat/node.c @@ -507,7 +507,7 @@ static int readdir(struct exfat* ef, struct exfat_node* parent, exfat_error("too long label (%hhu chars)", label->length); return -EIO; } - if (utf16_to_utf8(ef->label, label->name, + if (exfat_utf16_to_utf8(ef->label, label->name, sizeof(ef->label), EXFAT_ENAME_MAX) != 0) return -EIO; break; @@ -1201,7 +1201,7 @@ int exfat_set_label(struct exfat* ef, const char* label) struct exfat_entry_label entry; memset(label_utf16, 0, sizeof(label_utf16)); - rc = utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX + 1, strlen(label)); + rc = exfat_utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX + 1, strlen(label)); if (rc != 0) return rc; diff --git a/libexfat/utf.c b/libexfat/utf.c index 0d0018c..d5a950a 100644 --- a/libexfat/utf.c +++ b/libexfat/utf.c @@ -101,7 +101,7 @@ static const le16_t* utf16_to_wchar(const le16_t* input, wchar_t* wc, } } -int utf16_to_utf8(char* output, const le16_t* input, size_t outsize, +int exfat_utf16_to_utf8(char* output, const le16_t* input, size_t outsize, size_t insize) { const le16_t* inp = input; @@ -202,7 +202,7 @@ static le16_t* wchar_to_utf16(le16_t* output, wchar_t wc, size_t outsize) return output + 2; } -int utf8_to_utf16(le16_t* output, const char* input, size_t outsize, +int exfat_utf8_to_utf16(le16_t* output, const char* input, size_t outsize, size_t insize) { const char* inp = input; diff --git a/libexfat/utils.c b/libexfat/utils.c index 7baa663..1adf97b 100644 --- a/libexfat/utils.c +++ b/libexfat/utils.c @@ -48,7 +48,7 @@ void exfat_stat(const struct exfat* ef, const struct exfat_node* node, void exfat_get_name(const struct exfat_node* node, char buffer[EXFAT_UTF8_NAME_BUFFER_MAX]) { - if (utf16_to_utf8(buffer, node->name, EXFAT_UTF8_NAME_BUFFER_MAX, + if (exfat_utf16_to_utf8(buffer, node->name, EXFAT_UTF8_NAME_BUFFER_MAX, EXFAT_NAME_MAX) != 0) exfat_bug("failed to convert name to UTF-8"); } diff --git a/mkfs/main.c b/mkfs/main.c index 473b476..a25db22 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -136,7 +136,7 @@ static int setup_volume_label(le16_t label[EXFAT_ENAME_MAX + 1], const char* s) memset(label, 0, (EXFAT_ENAME_MAX + 1) * sizeof(le16_t)); if (s == NULL) return 0; - return utf8_to_utf16(label, s, EXFAT_ENAME_MAX + 1, strlen(s)); + return exfat_utf8_to_utf16(label, s, EXFAT_ENAME_MAX + 1, strlen(s)); } static uint32_t setup_volume_serial(uint32_t user_defined) -- cgit v1.2.3