diff options
author | Steve Kondik <steve@cyngn.com> | 2016-01-21 14:46:00 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-01-21 14:46:00 -0800 |
commit | 4a8592e2f673ea02c3cb1f2c89eda950d3c13850 (patch) | |
tree | 0c157bd4abbc2e53fa3ae67f38e3459524d9b9c6 | |
parent | 8f3956f6fc0b7601845d288293ac92880a828b25 (diff) | |
download | android_external_exfat-stable/cm-13.0-ZNH2KB.tar.gz android_external_exfat-stable/cm-13.0-ZNH2KB.tar.bz2 android_external_exfat-stable/cm-13.0-ZNH2KB.zip |
exfat-fuse: Don't export UTF conversion functionsHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0
* These will collide with other tools during static linking. Convert
them to inlines instead.
Change-Id: Icea3a5c2cb46fe034264c6a161868b8253923d03
-rw-r--r-- | libexfat/Android.mk | 2 | ||||
-rw-r--r-- | libexfat/exfat.h | 6 | ||||
-rw-r--r-- | libexfat/lookup.c | 1 | ||||
-rw-r--r-- | libexfat/node.c | 1 | ||||
-rw-r--r-- | libexfat/utf.h (renamed from libexfat/utf.c) | 6 | ||||
-rw-r--r-- | libexfat/utils.c | 1 | ||||
-rw-r--r-- | mkfs/main.c | 1 | ||||
-rw-r--r-- | mkfs/rootdir.c | 1 |
8 files changed, 9 insertions, 10 deletions
diff --git a/libexfat/Android.mk b/libexfat/Android.mk index 7bbeb46..b85361a 100644 --- a/libexfat/Android.mk +++ b/libexfat/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) -common_src_files = cluster.c io.c log.c lookup.c mount.c node.c time.c utf.c utils.c +common_src_files = cluster.c io.c log.c lookup.c mount.c node.c time.c utils.c include $(CLEAR_VARS) LOCAL_MODULE := libexfat diff --git a/libexfat/exfat.h b/libexfat/exfat.h index 5beba7c..a8676ec 100644 --- a/libexfat/exfat.h +++ b/libexfat/exfat.h @@ -194,12 +194,6 @@ 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, - size_t insize); -int utf8_to_utf16(le16_t* output, const char* input, size_t outsize, - size_t insize); -size_t utf16_length(const le16_t* str); - struct exfat_node* exfat_get_node(struct exfat_node* node); void exfat_put_node(struct exfat* ef, struct exfat_node* node); int exfat_cleanup_node(struct exfat* ef, struct exfat_node* node); diff --git a/libexfat/lookup.c b/libexfat/lookup.c index d5bb389..0b0d5aa 100644 --- a/libexfat/lookup.c +++ b/libexfat/lookup.c @@ -21,6 +21,7 @@ */ #include "exfat.h" +#include "utf.h" #include <string.h> #include <errno.h> #include <inttypes.h> diff --git a/libexfat/node.c b/libexfat/node.c index 4dd4dc6..bf76036 100644 --- a/libexfat/node.c +++ b/libexfat/node.c @@ -21,6 +21,7 @@ */ #include "exfat.h" +#include "utf.h" #include <errno.h> #include <string.h> #include <inttypes.h> diff --git a/libexfat/utf.c b/libexfat/utf.h index 6f14882..1ec5b71 100644 --- a/libexfat/utf.c +++ b/libexfat/utf.h @@ -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, +static inline int utf16_to_utf8(char* output, const le16_t* input, size_t outsize, size_t insize) { const le16_t* inp = input; @@ -195,7 +195,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, + static inline int utf8_to_utf16(le16_t* output, const char* input, size_t outsize, size_t insize) { const char* inp = input; @@ -221,7 +221,7 @@ int utf8_to_utf16(le16_t* output, const char* input, size_t outsize, return 0; } -size_t utf16_length(const le16_t* str) +static inline size_t utf16_length(const le16_t* str) { size_t i = 0; diff --git a/libexfat/utils.c b/libexfat/utils.c index 388f360..32c1e62 100644 --- a/libexfat/utils.c +++ b/libexfat/utils.c @@ -21,6 +21,7 @@ */ #include "exfat.h" +#include "utf.h" #include <string.h> #include <stdio.h> #include <inttypes.h> diff --git a/mkfs/main.c b/mkfs/main.c index 2ee6da6..0cf972d 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -26,6 +26,7 @@ #include "cbm.h" #include "uct.h" #include "rootdir.h" +#include <utf.h> #include <exfat.h> #include <sys/types.h> #include <sys/time.h> diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c index 84fa31f..f31d5e0 100644 --- a/mkfs/rootdir.c +++ b/mkfs/rootdir.c @@ -24,6 +24,7 @@ #include "uct.h" #include "cbm.h" #include "uctc.h" +#include <utf.h> #include <string.h> static off_t rootdir_alignment(void) |