From ae4131cbf07043c312551a13f33dc3d9db2b774e Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Mon, 16 Jun 2014 19:28:02 -0400
Subject: [PATCH] logger: remove (most) android hacks
Change-Id: Id4b1d6f43e18eb079752bbc5b79b922a711b51c2
Refs: #46972
---
daemon/src/logger.c | 1 +
daemon/src/logger.h | 44 ++++++++++++++++++++++++--------------------
2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/daemon/src/logger.c b/daemon/src/logger.c
index f775191836..c885410ff9 100644
--- a/daemon/src/logger.c
+++ b/daemon/src/logger.c
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
+#include <errno.h>
#include "logger.h"
diff --git a/daemon/src/logger.h b/daemon/src/logger.h
index a1059e8624..3b1f04f0e5 100644
--- a/daemon/src/logger.h
+++ b/daemon/src/logger.h
@@ -38,12 +38,6 @@ extern "C" {
#include <stdint.h>
#include <pthread.h>
-#ifdef __ANDROID__
-#include <android/log.h>
-#else
-#include <syslog.h>
-#endif
-
/**
* Print something, coloring it depending on the level
*/
@@ -73,16 +67,9 @@ void strErr();
(unsigned long) pthread_self() & 0xffff, \
##__VA_ARGS__
-#ifndef __ANDROID__
-
-#define FILE_NAME __FILE__
-#define ERROR(M, ...) LOGGER(M, LOG_ERR, ##__VA_ARGS__)
-#define WARN(M, ...) LOGGER(M, LOG_WARNING, ##__VA_ARGS__)
-#define INFO(M, ...) LOGGER(M, LOG_INFO, ##__VA_ARGS__)
-#define DEBUG(M, ...) LOGGER(M, LOG_DEBUG, ##__VA_ARGS__)
-#define LOGGER(M, LEVEL, ...) logger(LEVEL, LOG_FORMAT(M, ##__VA_ARGS__))
+#ifdef __ANDROID__
-#else /* __ANDROID__ */
+#include <android/log.h>
#ifndef APP_NAME
#define APP_NAME "libsflphone"
@@ -92,13 +79,30 @@ void strErr();
#define FILE_NAME (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 \
: __FILE__)
-#define ERROR(M, ...) LOGGER(M, ANDROID_LOG_ERROR, ##__VA_ARGS__)
-#define WARN(M, ...) LOGGER(M, ANDROID_LOG_WARN, ##__VA_ARGS__)
-#define INFO(M, ...) LOGGER(M, ANDROID_LOG_INFO, ##__VA_ARGS__)
-#define DEBUG(M, ...) LOGGER(M, ANDROID_LOG_DEBUG, ##__VA_ARGS__)
-#define LOGGER(M, LEVEL, ...) __android_log_print(LEVEL, APP_NAME, LOG_FORMAT(M, ##__VA_ARGS__))
+// because everyone likes reimplementing the wheel
+#define LOG_ERR ANDROID_LOG_ERROR
+#define LOG_WARNING ANDROID_LOG_WARN
+#define LOG_INFO ANDROID_LOG_INFO
+#define LOG_DEBUG ANDROID_LOG_DEBUG
+
+#define LOGGER(M, LEVEL, ...) __android_log_print(LEVEL, APP_NAME, \
+ LOG_FORMAT(M, ##__VA_ARGS__))
+#else /* __ANDROID__ */
+
+#include <syslog.h>
+
+#define FILE_NAME __FILE__
+
+#define LOGGER(M, LEVEL, ...) logger(LEVEL, LOG_FORMAT(M, ##__VA_ARGS__))
+
#endif /* __ANDROID__ */
+#define ERROR(M, ...) LOGGER(M, LOG_ERR, ##__VA_ARGS__)
+#define WARN(M, ...) LOGGER(M, LOG_WARNING, ##__VA_ARGS__)
+#define INFO(M, ...) LOGGER(M, LOG_INFO, ##__VA_ARGS__)
+#define DEBUG(M, ...) LOGGER(M, LOG_DEBUG, ##__VA_ARGS__)
+
+
#define BLACK "\033[22;30m"
#define RED "\033[22;31m"
#define GREEN "\033[22;32m"
--
GitLab