Address comments

Author: cymbalrush

backends/apple/coreml/runtime/delegate/ETCoreMLLogging.h

@@ -47,22 +47,24 @@ typedef NS_ERROR_ENUM(ETCoreMLErrorDomain, ETCoreMLError) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
 
-#if ET_LOG_ENABLED
-#define ETCoreMLLogError(error, formatString, ...)                                                                 \
-    ET_LOG(Error,                                                                                                  \
-           "%s",                                                                                                   \
-           [NSString stringWithFormat:@"[Core ML] " formatString " %@", ##__VA_ARGS__, error.localizedDescription] \
-               .UTF8String);
+#if ET_LOG_ENABLED 
+#define ETCoreMLLogError(error, formatString, ...)                                                                  \
+    do {                                                                                                            \
+        NSString *message =  error.localizedDescription;                                                            \
+        message = [NSString stringWithFormat:@"[Core ML] " formatString " %@", ##__VA_ARGS__, message];             \   
+        ET_LOG(Error, "%s", message.UTF8String);                                                                    \ 
+    } while(0)                                                                                                      \
 #else
-#define ETCoreMLLogError(error, formatString, ...) \
+#define ETCoreMLLogError(error, formatString, ...)                                                                  \
     os_log_error(ETCoreMLErrorUtils.loggingChannel, formatString " %@", ##__VA_ARGS__, error.localizedDescription);
 #endif
 
 #if ET_LOG_ENABLED
-#define ETCoreMLLogInfo(formatString, ...) \
+#define ETCoreMLLogInfo(formatString, ...)                               \
     ET_LOG(Info, "%s", [NSString stringWithFormat:formatString, ##__VA_ARGS__].UTF8String);
 #else
-#define ETCoreMLLogInfo(formatString, ...) os_log_info(ETCoreMLErrorUtils.loggingChannel, formatString, ##__VA_ARGS__);
+#define ETCoreMLLogInfo(formatString, ...) \
+    os_log_info(ETCoreMLErrorUtils.loggingChannel, formatString, ##__VA_ARGS__);
 #endif
 
 /// Record the error with `os_log_error` and fills `*errorOut` with `NSError`.
@@ -79,11 +81,14 @@ typedef NS_ERROR_ENUM(ETCoreMLErrorDomain, ETCoreMLError) {
 
 /// Record the error and its underlying error with `os_log_error` and fills `*errorOut` with `NSError`.
 #define ETCoreMLLogUnderlyingErrorAndSetNSError(errorOut, errorCode, underlyingNSError, formatString, ...) \
-    ETCoreMLLogError(underlyingNSError, formatString, ##__VA_ARGS__) if (errorOut) {                       \
-        *errorOut = [ETCoreMLErrorUtils errorWithCode:errorCode                                            \
-                                      underlyingError:underlyingNSError                                    \
-                                               format:@formatString, ##__VA_ARGS__];                       \
-    }
+    do {                                                                                                   \
+        ETCoreMLLogError(underlyingNSError, formatString, ##__VA_ARGS__);                                  \
+        if (errorOut) {                                                                                    \
+            *errorOut = [ETCoreMLErrorUtils errorWithCode:errorCode                                        \
+                                        underlyingError:underlyingNSError                                  \
+                                                format:@formatString, ##__VA_ARGS__];                      \
+        }                                                                                                  \
+    } while(0)                                                                                             \ 
 
 
 #pragma clang diagnostic pop