From 20fcf449fc55a75e3369d4cff2c614cc678f6d42 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 16 Oct 2015 11:09:03 +0200 Subject: [PATCH] Utils.m: properly handle UTF8 logging --- Classes/Utils/Utils.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 06ba6f344..8b857cf36 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -28,15 +28,17 @@ va_list args; va_start(args, format); NSString *str = [[NSString alloc] initWithFormat:format arguments:args]; + NSStringEncoding enc = CFStringConvertEncodingToNSStringEncoding(CFStringGetSystemEncoding()); + const char *utf8str = [str cStringUsingEncoding:enc]; int filesize = 20; const char *filename = strchr(file, '/') ? strrchr(file, '/') + 1 : file; if (severity <= ORTP_DEBUG) { // lol: ortp_debug(XXX) can be disabled at compile time, but ortp_log(ORTP_DEBUG, xxx) will always be valid even // not in debug build... - ortp_debug("%*s:%3d - %s", filesize, filename + MAX((int)strlen(filename) - filesize, 0), line, str.UTF8String); + ortp_debug("%*s:%3d - %s", filesize, filename + MAX((int)strlen(filename) - filesize, 0), line, utf8str); } else { ortp_log(severity, "%*s:%3d - %s", filesize, filename + MAX((int)strlen(filename) - filesize, 0), line, - str.UTF8String); + utf8str); } va_end(args); }