Merge remote-tracking branch 'origin/routing-manager'

[platform/upstream/iotivity.git] / resource / csdk / logger / src / logger.c

diff --git a/resource/csdk/logger/src/logger.c b/resource/csdk/logger/src/logger.c
index 3d8e4d9..8e21e33 100644 (file)
--- a/resource/csdk/logger/src/logger.c
+++ b/resource/csdk/logger/src/logger.c
@@ -89,32 +89,7 @@ static const uint16_t LINE_BUFFER_SIZE = (16 * 2) + 16 + 1;  // Show 16 bytes, 2
 
 
 #ifndef ARDUINO
-#ifdef __TIZEN__
-
-int OCGetTizenLogLevel(LogLevel level)
-{
-    switch(level)
-    {
-        case DEBUG:
-            return DLOG_DEBUG;
-        case INFO:
-            return DLOG_INFO;
-        case WARNING:
-            return DLOG_WARN;
-        case ERROR:
-            return DLOG_ERROR;
-        case FATAL:
-            /*
-             * Temp fix to resolve DLOG_FATAL runtime crash in tizen binary.
-             * TODO: Revert back to DLOG_FATAL once logging issue is fixed in
-             * Tizen binary.
-             */
-            return DLOG_ERROR;
-    }
-    return DLOG_DEBUG;
-}
-
-#else
+#ifndef __TIZEN__
 void OCLogConfig(oc_log_ctx_t *ctx) {
     logCtx = ctx;
 }
@@ -202,7 +177,6 @@ void OCLog(LogLevel level, const char * tag, const char * logStr) {
     }
     else
     {
-
         int min = 0;
         int sec = 0;
         int ms = 0;
@@ -361,7 +335,7 @@ void OCLogBuffer(LogLevel level, const char * tag, const uint8_t * buffer, uint1
      * @param tag    - Module name
      * @param format - variadic log string
      */
-    void OCLogv(LogLevel level, PROGMEM const char * tag, const char * format, ...)
+    void OCLogv(LogLevel level, PROGMEM const char * tag, PROGMEM const char * format, ...)
     {
         char buffer[LINE_BUFFER_SIZE];
         va_list ap;
@@ -379,7 +353,11 @@ void OCLogBuffer(LogLevel level, const char * tag, const uint8_t * buffer, uint1
         }
         Serial.print(F(": "));
 
+#ifdef __AVR__
+        vsnprintf_P(buffer, sizeof(buffer), format, ap);
+#else
         vsnprintf(buffer, sizeof(buffer), format, ap);
+#endif
         for(char *p = &buffer[0]; *p; p++) // emulate cooked mode for newlines
         {
             if(*p == '\n')
@@ -391,51 +369,5 @@ void OCLogBuffer(LogLevel level, const char * tag, const uint8_t * buffer, uint1
         Serial.println();
         va_end(ap);
     }
-    /**
-     * Output a variable argument list log string with the specified priority level.
-     * Only defined for Arduino as depicted below.
-     *
-     * @param level  - DEBUG, INFO, WARNING, ERROR, FATAL
-     * @param tag    - Module name
-     * @param format - variadic log string
-     */
-    void OCLogv(LogLevel level, PROGMEM const char * tag, const __FlashStringHelper *format, ...)
-    {
-        char buffer[LINE_BUFFER_SIZE];
-        va_list ap;
-        va_start(ap, format);
-
-        GET_PROGMEM_BUFFER(buffer, &(LEVEL[level]));
-        Serial.print(buffer);
-
-        char c;
-        Serial.print(F(": "));
-
-        while ((c = pgm_read_byte(tag))) {
-          Serial.write(c);
-          tag++;
-        }
-        Serial.print(F(": "));
-
-        #ifdef __AVR__
-            vsnprintf_P(buffer, sizeof(buffer), (const char *)format, ap); // progmem for AVR
-        #else
-            vsnprintf(buffer, sizeof(buffer), (const char *)format, ap); // for the rest of the world
-        #endif
-        for(char *p = &buffer[0]; *p; p++) // emulate cooked mode for newlines
-        {
-            if(*p == '\n')
-            {
-                Serial.write('\r');
-            }
-            Serial.write(*p);
-        }
-        Serial.println();
-        va_end(ap);
-    }
-
 
 #endif
-
-
-