commit 268cdd0e0995633048b2fa2432b6bab9d376bbfb
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Tue Apr 10 12:57:54 2018 +0200
committer Fabio Utzig <utzig@utzig.org> Tue Apr 10 08:16:35 2018 -0300
tree 58b9aa7d549925b42bc87f46bfe10cbfc92b90b9
parent 8a67dba3671220cb709184fec1bdb0fa76457424

fix warnings while building along with serial recovery

Following warnings were fixed within this patch:

 'isspace' macro should take an int value

 function 'bs_reset' should return void

 redefinition of 'MBEDTLS_CONFIG_FILE' macro while
 it is already defined by the zephyr build system.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/boot_serial/src/boot_serial.c

diff --git a/boot/boot_serial/src/boot_serial.c b/boot/boot_serial/src/boot_serial.c
index e23040c..f4c6087 100644
--- a/boot/boot_serial/src/boot_serial.c
+++ b/boot/boot_serial/src/boot_serial.c
@@ -118,7 +118,7 @@
     ptr += strlen(name);
 
     while (*ptr != '\0') {
-        if (*ptr != ':' && !isspace(*ptr)) {
+        if (*ptr != ':' && !isspace((int)*ptr)) {
             break;
         }
         ++ptr;
@@ -292,7 +292,7 @@
  * Reset, and (presumably) boot to newly uploaded image. Flush console
  * before restarting.
  */
-static int
+static void
 bs_reset(char *buf, int len)
 {
     cbor_encoder_create_map(&bs_root, &bs_rsp, CborIndefiniteLength);

boot/zephyr/os.c

diff --git a/boot/zephyr/os.c b/boot/zephyr/os.c
index 1f9b178..deb9dce 100644
--- a/boot/zephyr/os.c
+++ b/boot/zephyr/os.c
@@ -23,7 +23,6 @@
 #include "os/os_heap.h"
 
 #ifdef MCUBOOT_USE_MBED_TLS
-#define MBEDTLS_CONFIG_FILE CONFIG_MBEDTLS_CFG_FILE
 
 #include <mbedtls/platform.h>
 #include <mbedtls/memory_buffer_alloc.h>
@@ -45,7 +44,6 @@
     mbedtls_memory_buffer_alloc_init(mempool, sizeof(mempool));
 }
 #else
-#define MBEDTLS_CONFIG_FILE MCUBOOT_MBEDTLS_CFG_FILE
 void os_heap_init(void)
 {
 }