Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a4b5f9e authored by Al Sutton's avatar Al Sutton
Browse files

Remove explict use of ASCII encoding 

Replace the use of CFStringGetCString with kCFStringEncodingASCII specified
with CFStringGetFileSystemRepresentation which will ensure the correct
character encoding is used to conver the CFString into a NULL terminated
char array suitable for use with POSIX APIs.

Change-Id: Ibab1dc05c4f4db8604d329a493b4241992b8e69d
parent 5d8a5ade

adb/get_my_path_darwin.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

fastboot/util_osx.c

+1 −1
Original line number Diff line number Diff line
@@ -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;