diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-21 18:37:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-21 18:37:19 +0000 |
| commit | 0750f78659758352490e599d057a39dc44e93340 (patch) | |
| tree | 441040e01cac00946d98c0b011706d42eabd2f46 | |
| parent | 01d49e854fa09a776c9673b229efcfa2d53adfea (diff) | |
| parent | 2a4b5f9e804f019c0d565c86579f07963989ed1b (diff) | |
| download | system_core-0750f78659758352490e599d057a39dc44e93340.zip system_core-0750f78659758352490e599d057a39dc44e93340.tar.gz system_core-0750f78659758352490e599d057a39dc44e93340.tar.bz2 | |
Merge "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; |