From 99fc922a19068c7e1ef5fc9d24c4c886be8b2182 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <edouard@pep-project.org>
Date: Tue, 7 Mar 2017 23:52:44 +0100
Subject: [PATCH] Added stdout logging in debug mode. Moved android logging
 code.

---
 src/pEpEngine.c    |  6 ------
 src/pEp_internal.h | 14 ++++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pEpEngine.c b/src/pEpEngine.c
index 786ce010..98b2ea4c 100644
--- a/src/pEpEngine.c
+++ b/src/pEpEngine.c
@@ -786,12 +786,6 @@ DYNAMIC_API PEP_STATUS log_event(
     assert(title);
     assert(entity);
 
-    #ifndef NDEBUG
-    #ifdef ANDROID
-    LOGD(" %s :: %s :: %s ", title, entity, description);
-    #endif
-    #endif
-
     if (!(session && title && entity))
         return PEP_ILLEGAL_VALUE;
 
diff --git a/src/pEp_internal.h b/src/pEp_internal.h
index 436197c4..c0ccd9b9 100644
--- a/src/pEp_internal.h
+++ b/src/pEp_internal.h
@@ -169,16 +169,18 @@ void release_transport_system(PEP_SESSION session, bool out_last);
 
 #ifdef NDEBUG
 #define DEBUG_LOG(TITLE, ENTITY, DESC)
-#define  LOGD(...)
 #else
-#define DEBUG_LOG(TITLE, ENTITY, DESC) \
-    log_event(session, (TITLE), (ENTITY), (DESC), "debug");
 #ifdef ANDROID
 #include <android/log.h>
-#define  LOG_TAG    "pEpEngine"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define  LOG_MORE(...)  __android_log_print(ANDROID_LOG_DEBUG, "pEpEngine", " %s :: %s :: %s ", __VA_ARGS__);
+#else
+#include <stdio.h>
+#define  LOG_MORE(...)  printf("pEpEngine DEBUG_LOG('%s','%s','%s')\n", __VA_ARGS__);
 #endif
-
+#define DEBUG_LOG(TITLE, ENTITY, DESC) {\
+    log_event(session, (TITLE), (ENTITY), (DESC), "debug");\
+    LOG_MORE((TITLE), (ENTITY), (DESC))\
+}
 #endif
 
 // Space tolerant and case insensitive fingerprint string compare