exfat-fuse: Don't export UTF conversion functions

 * These will collide with other tools during static linking. Convert
   them to inlines instead.

Change-Id: Icea3a5c2cb46fe034264c6a161868b8253923d03

diff --git a/libexfat/Android.mk b/libexfat/Android.mk
index 7bbeb46..b85361a 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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
similarity index 96%
rename from libexfat/utf.c
rename to libexfat/utf.h
index 6f14882..1ec5b71 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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)