Corrected defects

Author: Mika Leppänen

source/6LoWPAN/ws/ws_pae_nvm_store.c

@@ -140,13 +140,12 @@ static int8_t ws_pae_nvm_store_write(const char *file_name, nvm_tlv_t *tlv)
     }
 
     size_t n_bytes = ns_fwrite(fp, tlv, tlv->len + sizeof(nvm_tlv_t));
+    ns_fclose(fp);
     if (n_bytes != tlv->len + sizeof(nvm_tlv_t)) {
         tr_error("NVM write error %s", file_name);
-        ns_fclose(fp);
         return PAE_NVM_FILE_WRITE_ERROR;
     }
 
-    ns_fclose(fp);
     return PAE_NVM_FILE_SUCCESS;
 }
 
@@ -163,13 +162,12 @@ 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));
+    ns_fclose(fp);
     if (n_bytes != tlv->len + sizeof(nvm_tlv_t)) {
         tr_warning("File not found or cannot be read: %s", file_name);
-        ns_fclose(fp);
         return PAE_NVM_FILE_READ_ERROR;
     }
 
-    ns_fclose(fp);
     return PAE_NVM_FILE_SUCCESS;
 }
 

source/Service_Libs/utils/ns_file_system.c

@@ -152,5 +152,6 @@ int ns_fsize(NS_FILE *ns_handle, size_t *size)
         return file_size_cb(ns_handle, size);
     }
 
-    return -1;
+    fseek((FILE *) ns_handle, 0L, SEEK_END);
+    return ftell((FILE *) ns_handle);
 }