@@ -769,11 +769,17 @@ void internal_join_thread(void *th) { pthread_join((pthread_t)th, 0); }
769
769
static Mutex syslog_lock;
770
770
# endif
771
771
772
+ # if SANITIZER_DRIVERKIT
773
+ # define SANITIZER_OS_LOG os_log
774
+ # else
775
+ # define SANITIZER_OS_LOG os_log_error
776
+ # endif
777
+
772
778
void WriteOneLineToSyslog (const char *s) {
773
779
#if !SANITIZER_GO
774
780
syslog_lock.CheckLocked ();
775
781
if (GetMacosAlignedVersion () >= MacosVersion (10 , 12 )) {
776
- os_log_error (OS_LOG_DEFAULT, " %{public}s" , s);
782
+ SANITIZER_OS_LOG (OS_LOG_DEFAULT, " %{public}s" , s);
777
783
} else {
778
784
#pragma clang diagnostic push
779
785
// as_log is deprecated.
@@ -837,12 +843,6 @@ void LogMessageOnPrintf(const char *str) {
837
843
838
844
void LogFullErrorReport (const char *buffer) {
839
845
# if !SANITIZER_GO
840
- # if SANITIZER_DRIVERKIT
841
- # define SANITIZER_OS_LOG os_log
842
- # else
843
- # define SANITIZER_OS_LOG os_log_error
844
- # endif
845
-
846
846
// Log with os_log.*. This will make it into the crash log.
847
847
if (internal_strncmp (SanitizerToolName, " AddressSanitizer" ,
848
848
sizeof (" AddressSanitizer" ) - 1 ) == 0 )
@@ -859,7 +859,6 @@ void LogFullErrorReport(const char *buffer) {
859
859
860
860
if (common_flags ()->log_to_syslog )
861
861
SANITIZER_OS_LOG (OS_LOG_DEFAULT, " Consult syslog for more information." );
862
- # undef SANITIZER_OS_LOG
863
862
864
863
// Log to syslog.
865
864
// The logging on OS X may call pthread_create so we need the threading
0 commit comments