From e1fc5a8aa8016c61d3c2be18c2f101be3ca9d461 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 22 Jun 2015 10:59:28 +0200
Subject: [PATCH] Remove LinphoneLoggerVerbosity and use OrtpLogLevel instead:
 stop reimplementing stuff uselessly

---
 Classes/Utils/Utils.h | 22 ++++++++--------------
 Classes/Utils/Utils.m | 27 +++++++++++----------------
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/Classes/Utils/Utils.h b/Classes/Utils/Utils.h
index e5dbcf3f4..998a818d1 100644
--- a/Classes/Utils/Utils.h
+++ b/Classes/Utils/Utils.h
@@ -26,19 +26,13 @@
     [inst_ isKindOfClass:[cls class]]? inst_ : nil; \
  })
 
-typedef enum _LinphoneLoggerSeverity {
-    LinphoneLoggerDebug = 0,
-    LinphoneLoggerLog,
-    LinphoneLoggerWarning,
-    LinphoneLoggerError,
-    LinphoneLoggerFatal
-} LinphoneLoggerSeverity;
-
+#import <ortp/ortp.h>
 
 @interface LinphoneLogger : NSObject {
 
 }
-+ (void)log:(LinphoneLoggerSeverity)severity file:(const char*)file line:(int)line format:(NSString *)format,...;
+
++ (void)log:(OrtpLogLevel)severity file:(const char *)file line:(int)line format:(NSString *)format, ...;
 void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 @end
 
@@ -62,11 +56,11 @@ void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 @end
 
 #define LOGV(level, ...) [LinphoneLogger log:level file:__FILE__ line:__LINE__ format:__VA_ARGS__]
-#define LOGI(...) LOGV(LinphoneLoggerLog, __VA_ARGS__)
-#define LOGD(...) LOGV(LinphoneLoggerDebug, __VA_ARGS__)
-#define LOGW(...) LOGV(LinphoneLoggerWarning, __VA_ARGS__)
-#define LOGE(...) LOGV(LinphoneLoggerError, __VA_ARGS__)
-#define LOGF(...) LOGV(LinphoneLoggerFatal, __VA_ARGS__)
+#define LOGD(...) LOGV(ORTP_DEBUG, __VA_ARGS__)
+#define LOGI(...) LOGV(ORTP_MESSAGE, __VA_ARGS__)
+#define LOGW(...) LOGV(ORTP_WARNING, __VA_ARGS__)
+#define LOGE(...) LOGV(ORTP_ERROR, __VA_ARGS__)
+#define LOGF(...) LOGV(ORTP_FATAL, __VA_ARGS__)
 
 #endif
 
diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m
index ec4f1ab59..b75f14e98 100644
--- a/Classes/Utils/Utils.m
+++ b/Classes/Utils/Utils.m
@@ -23,30 +23,25 @@
 
 @implementation LinphoneLogger
 
-
-+ (void)logv:(LinphoneLoggerSeverity)severity file:(const char*)file line:(int)line format:(NSString*)format args:(va_list)args{
-    NSString *str = [[NSString alloc] initWithFormat:format arguments:args];
-	OrtpLogLevel ortp_severity;
++ (void)logv:(OrtpLogLevel)severity
+		file:(const char *)file
+		line:(int)line
+	  format:(NSString *)format
+		args:(va_list)args {
+	NSString *str = [[NSString alloc] initWithFormat:format arguments:args];
 	int filesize = 20;
-	if (severity <= LinphoneLoggerDebug) {
+	if (severity <= ORTP_DEBUG) {
 		// lol: ortp_debug(XXX) can be disabled at compile time, but ortp_log(ORTP_DEBUG, xxx) will always be valid even
 		//      not in debug build...
 		ortp_debug("%*s:%3d - %s", filesize, file+MAX((int)strlen(file)-filesize,0), line, [str UTF8String]);
-		return;
-	} else if(severity <= LinphoneLoggerLog) {
-		ortp_severity = ORTP_MESSAGE;
-	} else if(severity <= LinphoneLoggerWarning) {
-		ortp_severity = ORTP_WARNING;
-	} else if(severity <= LinphoneLoggerError) {
-		ortp_severity = ORTP_ERROR;
 	} else {
-		ortp_severity = ORTP_FATAL;
+		ortp_log(severity, "%*s:%3d - %s", filesize, file + MAX((int)strlen(file) - filesize, 0), line,
+				 [str UTF8String]);
 	}
-    ortp_log(ortp_severity, "%*s:%3d - %s", filesize, file+MAX((int)strlen(file)-filesize,0), line, [str UTF8String]);
 }
 
-+ (void)log:(LinphoneLoggerSeverity) severity file:(const char*)file line:(int)line format:(NSString *)format,... {
-    va_list args;
++ (void)log:(OrtpLogLevel)severity file:(const char *)file line:(int)line format:(NSString *)format, ... {
+	va_list args;
 	va_start (args, format);
 	[LinphoneLogger logv:severity file:file line:line format:format args:args];
     va_end (args);