Change ext4_fread & ext4_fwrite prototypes

It is better idea  to pass size_t type to fwrite & fread instead of uint32_t.

diff --git a/demos/chibios/common/test_lwext4.c b/demos/chibios/common/test_lwext4.c
index 8a0adcf93c22de29d902c2f00f838ff48b826fc7..4976d6ff196e6c6f129ab2ac404544e70c0ac8f6 100644 (file)
--- a/demos/chibios/common/test_lwext4.c
+++ b/demos/chibios/common/test_lwext4.c
@@ -222,7 +222,7 @@ static int verify_buf(const unsigned char *b, size_t len, unsigned char c)
 bool test_lwext4_file_test(uint32_t rw_szie, uint32_t rw_count)
 {
        int r;
-       uint32_t size;
+       size_t size;
        uint32_t i;
        clock_t start;
        clock_t stop;

diff --git a/demos/generic/main.c b/demos/generic/main.c
index f77823e27db23f5f93473e8d04e5e57ab4426f5e..079fb5be9d5156636fb6174dabbebdce7d653a7b 100644 (file)
--- a/demos/generic/main.c
+++ b/demos/generic/main.c
@@ -256,7 +256,7 @@ static bool dir_test(int len)
 static bool file_test(void)\r
 {\r
        int r;\r
-       uint32_t size;\r
+       size_t size;\r
        ext4_file f;\r
        int i;\r
        clock_t start;\r

diff --git a/demos/stm32f429_disco/main.c b/demos/stm32f429_disco/main.c
index 83339ab52828984ca7e4806c11b6079ddf489a40..c9ca86c77c79ad205d7cfad7e302c13252c7a026 100644 (file)
--- a/demos/stm32f429_disco/main.c
+++ b/demos/stm32f429_disco/main.c
@@ -247,7 +247,7 @@ static bool dir_test(int len)
 static bool file_test(void)\r
 {\r
     int r;\r
-    uint32_t  size;\r
+    size_t  size;\r
     ext4_file f;\r
     int i;\r
     clock_t start;\r

diff --git a/fs_test/lwext4_server.c b/fs_test/lwext4_server.c
index 4c9c96a838bd2e41239022df989ce5c88f4965a8..32b37bd39f0cda72866852dd1476b4aeea1d1e07 100644 (file)
--- a/fs_test/lwext4_server.c
+++ b/fs_test/lwext4_server.c
@@ -550,7 +550,7 @@ int _fread(char *p)
        int len;\r
        int d;\r
        int rc;\r
-       int rb;\r
+       size_t rb;\r
 \r
        if (sscanf(p, "%d %d %d %d", &fid, &d, &len, &d) != 4) {\r
                printf("Param list error\n");\r
@@ -595,10 +595,11 @@ int _fread(char *p)
 int _fwrite(char *p)\r
 {\r
        int fid = MAX_FILES;\r
-       int len;\r
        int d;\r
        int rc;\r
-       int wb;\r
+\r
+       size_t len;\r
+       size_t wb;\r
 \r
        if (sscanf(p, "%d %d %d %d", &fid, &d, &len, &d) != 4) {\r
                printf("Param list error\n");\r
@@ -867,10 +868,10 @@ int _multi_fwrite(char *p)
        char path[256];\r
        char path1[256];\r
        char prefix[32];\r
-       int cnt;\r
+       int cnt, i;\r
        int len, ll;\r
        int rc;\r
-       int i, d, wb;\r
+       size_t d, wb;\r
        ext4_file fd;\r
 \r
        if (sscanf(p, "%s %s %d %d", path, prefix, &cnt, &ll) != 4) {\r
@@ -912,8 +913,8 @@ int _multi_fread(char *p)
        char prefix[32];\r
        int cnt;\r
        int len, ll;\r
-       int rc;\r
-       int i, d, rb;\r
+       int rc ,i, d;\r
+       size_t rb;\r
        ext4_file fd;\r
 \r
        if (sscanf(p, "%s %s %d %d", path, prefix, &cnt, &ll) != 4) {\r

diff --git a/lwext4/ext4.c b/lwext4/ext4.c
index bc98a197217ea6e5727177927e8299a3fd2a5948..b497ffadc8fa7e68a9f9a706ab8a259838ca2241 100644 (file)
--- a/lwext4/ext4.c
+++ b/lwext4/ext4.c
@@ -1236,7 +1236,7 @@ int ext4_ftruncate(ext4_file *f, uint64_t size)
        return r;
 }
 
-int ext4_fread(ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt)
+int ext4_fread(ext4_file *f, void *buf, size_t size, size_t *rcnt)
 {
        uint32_t u;
        uint32_t fblock;
@@ -1370,7 +1370,7 @@ Finish:
        return r;
 }
 
-int ext4_fwrite(ext4_file *f, const void *buf, uint32_t size, uint32_t *wcnt)
+int ext4_fwrite(ext4_file *f, const void *buf, size_t size, size_t *wcnt)
 {
        uint32_t u;
        uint32_t fblock;

diff --git a/lwext4/ext4.h b/lwext4/ext4.h
index 4328c22adbde7e7c3286a3a79e6abd15b4b625bc..6bd33902c49f610dfc323f6d404c69cf8e1c9ca6 100644 (file)
--- a/lwext4/ext4.h
+++ b/lwext4/ext4.h
@@ -43,6 +43,7 @@
 #include "ext4_blockdev.h"
 
 #include <stdint.h>
+#include <stddef.h>
 
 /********************************FILE OPEN FLAGS*****************************/
 
@@ -323,7 +324,7 @@ int ext4_ftruncate(ext4_file *f, uint64_t size);
  * @param   size bytes to read
  * @param   rcnt bytes read (may be NULL)
  * @return  standard error code*/
-int ext4_fread(ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt);
+int ext4_fread(ext4_file *f, void *buf, size_t size, size_t *rcnt);
 
 /**@brief   Write data to file.
  * @param   f file handle
@@ -331,7 +332,7 @@ int ext4_fread(ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt);
  * @param   size write length
  * @param   wcnt bytes written (may be NULL)
  * @return  standard error code*/
-int ext4_fwrite(ext4_file *f, const void *buf, uint32_t size, uint32_t *wcnt);
+int ext4_fwrite(ext4_file *f, const void *buf, size_t size, size_t *wcnt);
 
 /**@brief   File seek operation.
  * @param   f file handle