From fbb12adbc42cc363fc903d2f10fbd87d1dacf733 Mon Sep 17 00:00:00 2001
From: Yogesh Pande <yogesh.pande@arm.com>
Date: Tue, 4 Jul 2017 23:14:54 -0700
Subject: [PATCH] Fix inconsistent mbed-trace dummy defines and original
 function declarations.

---
 features/FEATURE_COMMON_PAL/mbed-trace/.gitignore   |  4 ++++
 .../FEATURE_COMMON_PAL/mbed-trace/CMakeLists.txt    |  1 +
 .../mbed-trace/mbed-trace/mbed_trace.h              |  2 +-
 features/FEATURE_COMMON_PAL/mbed-trace/module.json  |  2 +-
 .../mbed-trace/source/mbed_trace.c                  | 13 +------------
 .../FEATURE_COMMON_PAL/mbed-trace/test/Test.cpp     | 13 +++++++++++++
 6 files changed, 21 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 features/FEATURE_COMMON_PAL/mbed-trace/CMakeLists.txt

diff --git a/features/FEATURE_COMMON_PAL/mbed-trace/.gitignore b/features/FEATURE_COMMON_PAL/mbed-trace/.gitignore
index d5203829daf..f55542c5e70 100644
--- a/features/FEATURE_COMMON_PAL/mbed-trace/.gitignore
+++ b/features/FEATURE_COMMON_PAL/mbed-trace/.gitignore
@@ -36,3 +36,7 @@ build/
 test_coverage/
 **/*.info
 **/*~
+output/*
+
+# Yotta files
+.yotta.json
diff --git a/features/FEATURE_COMMON_PAL/mbed-trace/CMakeLists.txt b/features/FEATURE_COMMON_PAL/mbed-trace/CMakeLists.txt
old mode 100755
new mode 100644
index 84a887c547f..86396b4a4cf
--- a/features/FEATURE_COMMON_PAL/mbed-trace/CMakeLists.txt
+++ b/features/FEATURE_COMMON_PAL/mbed-trace/CMakeLists.txt
@@ -7,6 +7,7 @@ project(mbedTrace)
 
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mbed-trace/)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../nanostack-libservice/mbed-client-libservice/)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../nanostack-libservice/)
 
diff --git a/features/FEATURE_COMMON_PAL/mbed-trace/mbed-trace/mbed_trace.h b/features/FEATURE_COMMON_PAL/mbed-trace/mbed-trace/mbed_trace.h
index 6309055ae72..eb4055b0c01 100644
--- a/features/FEATURE_COMMON_PAL/mbed-trace/mbed-trace/mbed_trace.h
+++ b/features/FEATURE_COMMON_PAL/mbed-trace/mbed-trace/mbed_trace.h
@@ -408,7 +408,7 @@ char* mbed_trace_array(const uint8_t* buf, uint16_t len);
 #elif !defined(MBED_TRACE_DUMMIES_DEFINED)
 // define dummies, hiding the real functions
 #define MBED_TRACE_DUMMIES_DEFINED
-#define mbed_trace_init(...)                        ((void) 0)
+#define mbed_trace_init(...)                        ((int) 0)
 #define mbed_trace_free(...)                        ((void) 0)
 #define mbed_trace_buffer_sizes(...)                ((void) 0)
 #define mbed_trace_config_set(...)                  ((void) 0)
diff --git a/features/FEATURE_COMMON_PAL/mbed-trace/module.json b/features/FEATURE_COMMON_PAL/mbed-trace/module.json
index 3ca14f7bc13..742ecbff8a6 100644
--- a/features/FEATURE_COMMON_PAL/mbed-trace/module.json
+++ b/features/FEATURE_COMMON_PAL/mbed-trace/module.json
@@ -1,6 +1,6 @@
 {
   "name": "mbed-trace",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Trace library for mbed devices",
   "keywords": [
     "trace",
diff --git a/features/FEATURE_COMMON_PAL/mbed-trace/source/mbed_trace.c b/features/FEATURE_COMMON_PAL/mbed-trace/source/mbed_trace.c
index 9c1c28fef70..5fdffd52c30 100644
--- a/features/FEATURE_COMMON_PAL/mbed-trace/source/mbed_trace.c
+++ b/features/FEATURE_COMMON_PAL/mbed-trace/source/mbed_trace.c
@@ -339,11 +339,6 @@ void mbed_vtracef(uint8_t dlevel, const char* grp, const char *fmt, va_list ap)
         if (plain == true || dlevel == TRACE_LEVEL_CMD) {
             //add trace data
             retval = vsnprintf(ptr, bLeft, fmt, ap);
-            //convenience - trim off one trailing \n. Useful if trying to directly
-            //connect debug layers that do expect callers to pass \n to mbed_trace.
-            if (retval > 0 && retval < bLeft && ptr[retval - 1] == '\n') {
-                ptr[--retval] = '\0';
-            }
             if (dlevel == TRACE_LEVEL_CMD && m_trace.cmd_printf) {
                 m_trace.cmd_printf(m_trace.line);
                 m_trace.cmd_printf("\n");
@@ -446,12 +441,6 @@ void mbed_vtracef(uint8_t dlevel, const char* grp, const char *fmt, va_list ap)
                 if (retval > 0) {
                     ptr += retval;
                     bLeft -= retval;
-                    //convenience - trim off one trailing \n. Useful if trying to directly
-                    //connect debug layers that do expect callers to pass \n to mbed_trace.
-                    if (ptr[-1] == '\n') {
-                        *--ptr = '\0';
-                        ++bLeft;
-                    }
                 }
             }
 
@@ -569,7 +558,7 @@ char *mbed_trace_array(const uint8_t *buf, uint16_t len)
     int i, bLeft = tmp_data_left();
     char *str, *wptr;
     str = m_trace.tmp_data_ptr;
-    if (str == NULL || bLeft == 0) {
+    if (len == 0 || str == NULL || bLeft == 0) {
         return "";
     }
     if (buf == NULL) {
diff --git a/features/FEATURE_COMMON_PAL/mbed-trace/test/Test.cpp b/features/FEATURE_COMMON_PAL/mbed-trace/test/Test.cpp
index 90b7a9343dc..52b5934d361 100644
--- a/features/FEATURE_COMMON_PAL/mbed-trace/test/Test.cpp
+++ b/features/FEATURE_COMMON_PAL/mbed-trace/test/Test.cpp
@@ -91,6 +91,19 @@ TEST(trace, Array)
   mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(longStr, 200) );
 }
 
+TEST(trace, Null0Array)
+{
+  static const unsigned char array[2] = { 0x23, 0x45 };
+  mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(array, 2));
+  STRCMP_EQUAL("23:45", buf);
+  mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(array, 0));
+  STRCMP_EQUAL("", buf);
+  mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(NULL, 0));
+  STRCMP_EQUAL("", buf);
+  mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "%s", mbed_trace_array(NULL, 2));
+  STRCMP_EQUAL("<null>", buf);
+}
+
 TEST(trace, LongString)
 {
   char longStr[1000] = {0x36};