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

Commit 224c3735 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 542324f4: am 0750f786: Merge "Remove explict use of ASCII encoding" 

* commit '542324f4':
  Remove explict use of ASCII encoding
parents 37d1efbe 542324f4

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;