Corrected warning trace, validations and ut stubs

Author: Mika Leppänen

source/6LoWPAN/ws/ws_pae_key_storage.c

@@ -789,10 +789,10 @@ void ws_pae_key_storage_remove(void)
     nvm_tlv_t *tlv = ws_pae_nvm_store_generic_tlv_allocate_and_create(
                          PAE_NVM_KEY_STORAGE_INDEX_TAG, PAE_NVM_KEY_STORAGE_INDEX_LEN);
 
-    ws_pae_nvm_store_tlv_file_read(KEY_STORAGE_INDEX_FILE, tlv);
-
     uint64_t store_bitfield = 0;
-    ws_pae_nvm_store_key_storage_index_tlv_read(tlv, &store_bitfield);
+    if (ws_pae_nvm_store_tlv_file_read(KEY_STORAGE_INDEX_FILE, tlv) >= 0) {
+        ws_pae_nvm_store_key_storage_index_tlv_read(tlv, &store_bitfield);
+    }
     ws_pae_nvm_store_generic_tlv_free(tlv);
 
     ws_pae_nvm_store_tlv_file_remove(KEY_STORAGE_INDEX_FILE);

source/6LoWPAN/ws/ws_pae_nvm_store.c

@@ -129,7 +129,6 @@ static int8_t ws_pae_nvm_store_create_path(char *data_path, const char *file_nam
 
 static int8_t ws_pae_nvm_store_write(const char *file_name, nvm_tlv_t *tlv)
 {
-
     if (!file_name || !tlv) {
         return -1;
     }
@@ -165,7 +164,7 @@ static int8_t ws_pae_nvm_store_read(const char *file_name, nvm_tlv_t *tlv)
 
     size_t n_bytes = ns_fread(fp, tlv, tlv->len + sizeof(nvm_tlv_t));
     if (n_bytes != tlv->len + sizeof(nvm_tlv_t)) {
-        tr_error("NVM write error %s", file_name);
+        tr_warning("File not found or cannot be read: %s", file_name);
         ns_fclose(fp);
         return PAE_NVM_FILE_READ_ERROR;
     }

source/6LoWPAN/ws/ws_pae_supp.c

@@ -426,7 +426,9 @@ static int8_t ws_pae_supp_nvm_keys_read(pae_supp_t *pae_supp)
         return -1;
     }
     ws_pae_nvm_store_generic_tlv_create(tlv, PAE_NVM_KEYS_TAG, PAE_NVM_KEYS_LEN);
-    ws_pae_nvm_store_tlv_file_read(KEYS_FILE_NAME, tlv);
+    if (ws_pae_nvm_store_tlv_file_read(KEYS_FILE_NAME, tlv) < 0) {
+        return -1;
+    }
     ws_pae_nvm_store_keys_tlv_read(tlv, &pae_supp->entry.sec_keys);
     return 0;
 }

test/nanostack/unittest/stub/ns_file_system_stub.c

@@ -19,6 +19,7 @@
 #include "ns_types.h"
 #include "nsdynmemLIB.h"
 #include "ns_file_system.h"
+#include "ns_file.h"
 
 static char *file_system_root;
 
@@ -32,3 +33,33 @@ char *ns_file_system_get_root_path(void)
     return file_system_root;
 }
 
+NS_FILE ns_fopen(const char *filename, const char *mode)
+{
+    return 0;
+}
+
+int ns_fclose(NS_FILE *ns_handle)
+{
+    return -1;
+}
+
+int ns_fremove(const char *filename)
+{
+    return -1;
+}
+
+size_t ns_fwrite(NS_FILE *ns_handle, const void *buffer, size_t size)
+{
+    return 0;
+}
+
+size_t ns_fread(NS_FILE *ns_handle, void *buffer, size_t size)
+{
+    return 0;
+}
+
+int ns_fsize(NS_FILE *ns_handle, size_t *size)
+{
+    return 0;
+}
+