diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-01-15 17:16:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-15 17:16:22 +0000 |
| commit | c6c3c7d44508dc8a80be794cbb97ed416b0eb539 (patch) | |
| tree | aa6720a95c360a80ac1bef1f6f17f6e83abe2c88 | |
| parent | 6c555ea3058d957795c40bc07b264701427453a2 (diff) | |
| parent | 77262e7db26a244ef013fcafc561ccd93c047a52 (diff) | |
| download | system_core-c6c3c7d44508dc8a80be794cbb97ed416b0eb539.zip system_core-c6c3c7d44508dc8a80be794cbb97ed416b0eb539.tar.gz system_core-c6c3c7d44508dc8a80be794cbb97ed416b0eb539.tar.bz2 | |
Merge "Remove explict use of ASCII encoding" into lmp-mr1-dev
| -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; |