fixes

Author: paulb777

FirebaseAppDistribution/Sources/FIRFADLogger.m

@@ -22,27 +22,27 @@
 void FIRFADDebugLog(NSString *message, ...) {
   va_list args_ptr;
   va_start(args_ptr, message);
-  FIRLogDebug(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
+  FIRLogBasicDebug(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
   va_end(args_ptr);
 }
 
 void FIRFADInfoLog(NSString *message, ...) {
   va_list args_ptr;
   va_start(args_ptr, message);
-  FIRLogInfo(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
+  FIRLogBasicInfo(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
   va_end(args_ptr);
 }
 
 void FIRFADWarningLog(NSString *message, ...) {
   va_list args_ptr;
   va_start(args_ptr, message);
-  FIRLogWarning(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
+  FIRLogBasicWarning(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
   va_end(args_ptr);
 }
 
 void FIRFADErrorLog(NSString *message, ...) {
   va_list args_ptr;
   va_start(args_ptr, message);
-  FIRLogError(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
+  FIRLogBasicError(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
   va_end(args_ptr);
 }

FirebaseCore/Extension/FIRLogger.h

@@ -131,6 +131,24 @@ extern void FIRLogInfo(NSString *category, NSString *messageCode, NSString *mess
 extern void FIRLogDebug(NSString *category, NSString *messageCode, NSString *message, ...)
     NS_FORMAT_FUNCTION(3, 4);
 
+/**
+ * This function is similar to the one above, except it takes a `va_list` instead of the listed variables.
+ * The following functions accept the following parameters in order:
+ * (required) service name of type FirebaseLoggerService.
+ * (required) message code starting from "I-" which means iOS, followed by a capitalized
+ *            three-character service identifier and a six digit integer message ID that is unique
+ *            within the service.
+ *            An example of the message code is @"I-COR000001".
+ *            See go/firebase-log-proposal for details.
+ * (required) message string which can be a format string.
+ * (optional) A va_list
+ */
+extern void FIRLogBasicError(NSString *category, NSString *messageCode, NSString *message, va_list args_ptr);
+extern void FIRLogBasicWarning(NSString *category, NSString *messageCode, NSString *message, va_list args_ptr);
+extern void FIRLogBasicNotice(NSString *category, NSString *messageCode, NSString *message, va_list args_ptr);
+extern void FIRLogBasicInfo(NSString *category, NSString *messageCode, NSString *message, va_list args_ptr);
+extern void FIRLogBasicDebug(NSString *category, NSString *messageCode, NSString *message, va_list args_ptr);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus

FirebaseCore/Sources/FIRLogger.m

@@ -171,6 +171,17 @@ void FIRLogBasic(FIRLoggerLevel level,
                 messageCode, message, args_ptr);
 }
 
+#define FIR_LOGGING_FUNCTION_BASIC(level)                                                       \
+  void FIRLogBasic##level(NSString *category, NSString *messageCode, NSString *message, va_list args_ptr) { \
+    FIRLogBasic(FIRLoggerLevel##level, category, messageCode, message, args_ptr);         \
+  }
+
+FIR_LOGGING_FUNCTION_BASIC(Error)
+FIR_LOGGING_FUNCTION_BASIC(Warning)
+FIR_LOGGING_FUNCTION_BASIC(Notice)
+FIR_LOGGING_FUNCTION_BASIC(Info)
+FIR_LOGGING_FUNCTION_BASIC(Debug)
+
 /**
  * Generates the logging functions using macros.
  *

Firestore/core/src/util/log_apple.mm

@@ -43,13 +43,13 @@ void LogMessageV(LogLevel level, NSString* format, ...) {
 
   switch (level) {
     case kLogLevelDebug:
-      FIRLogDebug(kFIRLoggerFirestore, @"I-FST000001", format, list);
+      FIRLogBasicDebug(kFIRLoggerFirestore, @"I-FST000001", format, list);
     case kLogLevelNotice:
-      FIRLogNotice(kFIRLoggerFirestore, @"I-FST000001", format, list);
+      FIRLogBasicNotice(kFIRLoggerFirestore, @"I-FST000001", format, list);
     case kLogLevelWarning:
-      FIRLogWarning(kFIRLoggerFirestore, @"I-FST000001", format, list);
+      FIRLogBasicWarning(kFIRLoggerFirestore, @"I-FST000001", format, list);
     case kLogLevelError:
-      FIRLogError(kFIRLoggerFirestore, @"I-FST000001", format, list);
+      FIRLogBasicError(kFIRLoggerFirestore, @"I-FST000001", format, list);
   }
   va_end(list);
 }