commit 0750f78659758352490e599d057a39dc44e93340
author Elliott Hughes <enh@google.com> Fri Nov 21 18:37:19 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 21 18:37:19 2014 +0000
tree 441040e01cac00946d98c0b011706d42eabd2f46
parent 01d49e854fa09a776c9673b229efcfa2d53adfea
parent 2a4b5f9e804f019c0d565c86579f07963989ed1b

Merge "Remove explict use of ASCII encoding"

adb/get_my_path_darwin.c

diff --git a/adb/get_my_path_darwin.c b/adb/get_my_path_darwin.c
index 65dd226..ff1396c 100644
--- a/adb/get_my_path_darwin.c
+++ b/adb/get_my_path_darwin.c
@@ -24,7 +24,7 @@
     CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
     CFRelease(executableURL);
 
-    CFStringGetCString(executablePathString, s, maxLen, kCFStringEncodingASCII);
+    CFStringGetFileSystemRepresentation(executablePathString, s, maxLen);
     CFRelease(executablePathString);
 }
 

fastboot/util_osx.c

diff --git a/fastboot/util_osx.c b/fastboot/util_osx.c
index a8f5c31..e718562 100644
--- a/fastboot/util_osx.c
+++ b/fastboot/util_osx.c
@@ -36,7 +36,7 @@
     CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
     CFRelease(executableURL);
 
-    CFStringGetCString(executablePathString, s, PATH_MAX-1, kCFStringEncodingASCII);
+    CFStringGetFileSystemRepresentation(executablePathString, s, PATH_MAX-1);
     CFRelease(executablePathString);
 
 	char *x;