diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-21 22:32:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 22:32:42 +0000 |
| commit | 224c3735ee367ff625304210345c8765cd709d5f (patch) | |
| tree | 4a3db5047e3f9b3ec5a5a2116368cd6eff42298f | |
| parent | 37d1efbea753f53fe0bbe82876014e516b4f3b61 (diff) | |
| parent | 542324f4b48897d40adb010afc440261c599633d (diff) | |
| download | system_core-224c3735ee367ff625304210345c8765cd709d5f.zip system_core-224c3735ee367ff625304210345c8765cd709d5f.tar.gz system_core-224c3735ee367ff625304210345c8765cd709d5f.tar.bz2 | |
am 542324f4: am 0750f786: Merge "Remove explict use of ASCII encoding"
* commit '542324f4b48897d40adb010afc440261c599633d':
Remove explict use of ASCII encoding
| -rw-r--r-- | adb/get_my_path_darwin.c | 2 | ||||
| -rw-r--r-- | fastboot/util_osx.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ void get_my_path(char *s, size_t maxLen) CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle); CFRelease(executableURL); - CFStringGetCString(executablePathString, s, maxLen, kCFStringEncodingASCII); + CFStringGetFileSystemRepresentation(executablePathString, s, maxLen); CFRelease(executablePathString); } 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 @@ void get_my_path(char s[PATH_MAX]) CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle); CFRelease(executableURL); - CFStringGetCString(executablePathString, s, PATH_MAX-1, kCFStringEncodingASCII); + CFStringGetFileSystemRepresentation(executablePathString, s, PATH_MAX-1); CFRelease(executablePathString); char *x; |