Merge branch 'charlesmchen/fixWarningsInAnalyticsMacros'

7 years ago · b6cecd44a8
parent 240b8adbd6 bdb50552d3
commit b6cecd44a8
2 changed files with 18 additions and 2 deletions
--- a/SignalServiceKit/src/Util/Asserts.h
+++ b/SignalServiceKit/src/Util/Asserts.h
@ -46,12 +46,28 @@
        NSCAssert(0, formattedMessage);                                                                                \
    }

+#define OWSFailNoFormat(message)                                                                                       \
+    {                                                                                                                  \
+        DDLogError(@"%s %@", __PRETTY_FUNCTION__, message);                                                            \
+        [DDLog flushLog];                                                                                              \
+        NSAssert(0, message);                                                                                          \
+    }
+
+#define OWSCFailNoFormat(message)                                                                                      \
+    {                                                                                                                  \
+        DDLogError(@"%s %@", __PRETTY_FUNCTION__, message);                                                            \
+        [DDLog flushLog];                                                                                              \
+        NSCAssert(0, message);                                                                                         \
+    }
+
 #else

 #define OWSAssert(X)
 #define OWSCAssert(X)
 #define OWSFail(message, ...)
 #define OWSCFail(message, ...)
+#define OWSFailNoFormat(X)
+#define OWSCFailNoFormat(X)

 #endif

--- a/SignalServiceKit/src/Util/OWSAnalytics.h
+++ b/SignalServiceKit/src/Util/OWSAnalytics.h
@ -92,9 +92,9 @@ typedef NSDictionary<NSString *, id> *_Nonnull (^OWSProdAssertParametersBlock)()
    }

 #define OWSProdFailWParams(__eventName, __parametersBlock)                                                             \
-    OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSFail)
+    OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSFailNoFormat)
 #define OWSProdCFailWParams(__eventName, __parametersBlock)                                                            \
-    OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSCFail)
+    OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSCFailNoFormat)

 #define OWSProdFail(__eventName) OWSProdFailWParams(__eventName, nil)