Change esp_vfs_t.write return value to ssize_t

write() should return ssize_t, not size_t.

diff --git a/components/fatfs/src/vfs_fat.c b/components/fatfs/src/vfs_fat.c
index df2eb4cadf52aaa2d16af53d31c34d667cf61f8a..9b33bd20e6cf53403a5efeb3d0b2de16a5d5a95b 100644 (file)
--- a/components/fatfs/src/vfs_fat.c
+++ b/components/fatfs/src/vfs_fat.c
@@ -45,7 +45,7 @@ typedef struct {
 
 static const char* TAG = "vfs_fat";
 
-static size_t vfs_fat_write(void* p, int fd, const void * data, size_t size);
+static ssize_t vfs_fat_write(void* p, int fd, const void * data, size_t size);
 static off_t vfs_fat_lseek(void* p, int fd, off_t size, int mode);
 static ssize_t vfs_fat_read(void* ctx, int fd, void * dst, size_t size);
 static int vfs_fat_open(void* ctx, const char * path, int flags, int mode);
@@ -290,7 +290,7 @@ out:
     return fd;
 }
 
-static size_t vfs_fat_write(void* ctx, int fd, const void * data, size_t size)
+static ssize_t vfs_fat_write(void* ctx, int fd, const void * data, size_t size)
 {
     vfs_fat_ctx_t* fat_ctx = (vfs_fat_ctx_t*) ctx;
     FIL* file = &fat_ctx->files[fd];

diff --git a/components/vfs/README.rst b/components/vfs/README.rst
index 26d857fc8df514793483a855e7f0786d5bc9118e..1f47c8239eb62fb979a7f4bef83bbb53e6ea49ef 100644 (file)
--- a/components/vfs/README.rst
+++ b/components/vfs/README.rst
@@ -31,7 +31,7 @@ Depending on the way FS driver declares its APIs, either ``read``, ``write``, et
 
 Case 1: API functions are declared without an extra context pointer (FS driver is a singleton)::
 
-    size_t myfs_write(int fd, const void * data, size_t size);
+    ssize_t myfs_write(int fd, const void * data, size_t size);
 
     // In definition of esp_vfs_t:
         .flags = ESP_VFS_FLAG_DEFAULT,
@@ -43,7 +43,7 @@ Case 1: API functions are declared without an extra context pointer (FS driver i
 
 Case 2: API functions are declared with an extra context pointer (FS driver supports multiple instances)::
 
-    size_t myfs_write(myfs_t* fs, int fd, const void * data, size_t size);
+    ssize_t myfs_write(myfs_t* fs, int fd, const void * data, size_t size);
 
     // In definition of esp_vfs_t:
         .flags = ESP_VFS_FLAG_CONTEXT_PTR,

diff --git a/components/vfs/include/esp_vfs.h b/components/vfs/include/esp_vfs.h
index 304750aabd6193d5897cc6b93916202bf2c21046..a3ce6b95cfcaea6f77bf21c7ac2d245dce384f27 100644 (file)
--- a/components/vfs/include/esp_vfs.h
+++ b/components/vfs/include/esp_vfs.h
@@ -69,8 +69,8 @@ typedef struct
     int fd_offset;  /*!< file descriptor offset, determined by the FS driver */
     int flags;      /*!< ESP_VFS_FLAG_CONTEXT_PTR or ESP_VFS_FLAG_DEFAULT */
     union {
-        size_t (*write_p)(void* p, int fd, const void * data, size_t size);
-        size_t (*write)(int fd, const void * data, size_t size);
+        ssize_t (*write_p)(void* p, int fd, const void * data, size_t size);
+        ssize_t (*write)(int fd, const void * data, size_t size);
     };
     union {
         off_t (*lseek_p)(void* p, int fd, off_t size, int mode);

diff --git a/components/vfs/vfs.c b/components/vfs/vfs.c
index fff3a93a1dcc8ed1d8417fbcd0f6b77a4ee53545..565edd3659901a9d2b0e66cf349588e8f551a650 100644 (file)
--- a/components/vfs/vfs.c
+++ b/components/vfs/vfs.c
@@ -213,7 +213,7 @@ ssize_t esp_vfs_write(struct _reent *r, int fd, const void * data, size_t size)
         return -1;
     }
     int local_fd = translate_fd(vfs, fd);
-    int ret;
+    ssize_t ret;
     CHECK_AND_CALL(ret, r, vfs, write, local_fd, data, size);
     return ret;
 }
@@ -226,7 +226,7 @@ off_t esp_vfs_lseek(struct _reent *r, int fd, off_t size, int mode)
         return -1;
     }
     int local_fd = translate_fd(vfs, fd);
-    int ret;
+    off_t ret;
     CHECK_AND_CALL(ret, r, vfs, lseek, local_fd, size, mode);
     return ret;
 }
@@ -239,7 +239,7 @@ ssize_t esp_vfs_read(struct _reent *r, int fd, void * dst, size_t size)
         return -1;
     }
     int local_fd = translate_fd(vfs, fd);
-    int ret;
+    ssize_t ret;
     CHECK_AND_CALL(ret, r, vfs, read, local_fd, dst, size);
     return ret;
 }

diff --git a/components/vfs/vfs_uart.c b/components/vfs/vfs_uart.c
index 545a5474fadd10ff841573b98a2c269e2021add8..4b37487649b07f893444a190638dc14a7c02879f 100644 (file)
--- a/components/vfs/vfs_uart.c
+++ b/components/vfs/vfs_uart.c
@@ -47,7 +47,7 @@ static void IRAM_ATTR uart_tx_char(uart_dev_t* uart, int c)
 }
 
 
-static size_t IRAM_ATTR uart_write(int fd, const void * data, size_t size)
+static ssize_t IRAM_ATTR uart_write(int fd, const void * data, size_t size)
 {
     assert(fd >=0 && fd < 3);
     const char *data_c = (const char *)data;