From bdb50552d34441afe58c107b2223928c71b2cb71 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 28 Jul 2017 11:29:44 -0400 Subject: [PATCH] Fix asserts in analytics macros. // FREEBIE --- SignalServiceKit/src/Util/Asserts.h | 16 ++++++++++++++++ SignalServiceKit/src/Util/OWSAnalytics.h | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Util/Asserts.h b/SignalServiceKit/src/Util/Asserts.h index 5c77695bd..09aeaaf32 100755 --- 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 diff --git a/SignalServiceKit/src/Util/OWSAnalytics.h b/SignalServiceKit/src/Util/OWSAnalytics.h index 7d660b5ec..202699d9b 100755 --- a/SignalServiceKit/src/Util/OWSAnalytics.h +++ b/SignalServiceKit/src/Util/OWSAnalytics.h @@ -92,9 +92,9 @@ typedef NSDictionary *_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)