Changeset 39330200 in mainline for uspace/lib

Timestamp:

2018-01-15T21:40:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ba29018

Parents:

d8023313

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-15 21:20:07)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-15 21:40:49)

Message:

Rename struct stat and struct statfs to vfs_stat_t and vfs_statfs_t,
respectively. They are nonstandard vestiges of times when native file API
was modeled after POSIX API.

Location:

uspace/lib

Files:

• bithenge/src/failure.c (modified) (1 diff)
• bithenge/src/failure.h (modified) (1 diff)
• bithenge/src/file.c (modified) (1 diff)
• c/generic/io/io.c (modified) (1 diff)
• c/generic/vfs/mtab.c (modified) (4 diffs)
• c/generic/vfs/vfs.c (modified) (6 diffs)
• c/include/vfs/vfs.h (modified) (3 diffs)
• fs/libfs.c (modified) (5 diffs)
• posix/source/sys/stat.c (modified) (3 diffs)
• posix/source/unistd.c (modified) (1 diff)

uspace/lib/bithenge/src/failure.c

@@ -225 +225 @@
 }
 
-errno_t bithenge_failure_fstat(int fd, struct stat *buf)
+errno_t bithenge_failure_fstat(int fd, vfs_stat_t *buf)
 {
         if (bithenge_should_fail()) {

uspace/lib/bithenge/src/failure.h

@@ -52 +52 @@
 char *bithenge_failure_str_ndup(const char *, size_t);
 errno_t bithenge_failure_open(const char *, int);
-errno_t bithenge_failure_fstat(int, struct stat *);
+errno_t bithenge_failure_fstat(int, vfs_stat_t *);
 
 #ifndef BITHENGE_FAILURE_DECLS_ONLY

uspace/lib/bithenge/src/file.c

@@ -102 +102 @@
         assert(out);
 
-        struct stat stat;
+        vfs_stat_t stat;
         errno_t rc = vfs_stat(fd, &stat);
         if (rc != EOK) {

uspace/lib/c/generic/io/io.c

@@ -814 +814 @@
         stream->ungetc_chars = 0;
 
-        struct stat st;
+        vfs_stat_t st;
         switch (whence) {
         case SEEK_SET:

uspace/lib/c/generic/vfs/mtab.c

@@ -42 +42 @@
 #include <str.h>
 
-static void process_mp(const char *path, struct stat *stat, list_t *mtab_list)
+static void process_mp(const char *path, vfs_stat_t *stat, list_t *mtab_list)
 {
         mtab_ent_t *ent;
@@ -54 +54 @@
         ent->service_id = stat->service_id;
 
-        struct statfs stfs;
+        vfs_statfs_t stfs;
         if (vfs_statfs_path(path, &stfs) == EOK)
                 str_cpy(ent->fs_name, sizeof(ent->fs_name), stfs.fs_name);
@@ -75 +75 @@
         while ((dirent = readdir(dir)) != NULL) {
                 char *child;
-                struct stat st;
+                vfs_stat_t st;
                 errno_t rc;
                 int ret;
@@ -123 +123 @@
 errno_t vfs_get_mtab_list(list_t *mtab_list)
 {
-        struct stat st;
+        vfs_stat_t st;
 
         errno_t rc = vfs_stat_path("/", &st);

uspace/lib/c/generic/vfs/vfs.c

@@ -352 +352 @@
 async_sess_t *vfs_fd_session(int file, iface_t iface)
 {
-        struct stat stat;
+        vfs_stat_t stat;
         errno_t rc = vfs_stat(file, &stat);
         if (rc != EOK)
@@ -1052 +1052 @@
  * @return              EOK on success or an error code
  */
-errno_t vfs_stat(int file, struct stat *stat)
+errno_t vfs_stat(int file, vfs_stat_t *stat)
 {
         errno_t rc;
@@ -1060 +1060 @@
         
         req = async_send_1(exch, VFS_IN_STAT, file, NULL);
-        rc = async_data_read_start(exch, (void *) stat, sizeof(struct stat));
+        rc = async_data_read_start(exch, (void *) stat, sizeof(vfs_stat_t));
         if (rc != EOK) {
                 vfs_exchange_end(exch);
@@ -1086 +1086 @@
  * @return              EOK on success or an error code
  */
-errno_t vfs_stat_path(const char *path, struct stat *stat)
+errno_t vfs_stat_path(const char *path, vfs_stat_t *stat)
 {
         int file;
@@ -1107 +1107 @@
  * @return              EOK on success or an error code
  */
-errno_t vfs_statfs(int file, struct statfs *st)
+errno_t vfs_statfs(int file, vfs_statfs_t *st)
 {
         errno_t rc, ret;
@@ -1132 +1132 @@
  * @return              EOK on success or an error code
  */
-errno_t vfs_statfs_path(const char *path, struct statfs *st)
+errno_t vfs_statfs_path(const char *path, vfs_statfs_t *st)
 {
         int file;

uspace/lib/c/include/vfs/vfs.h

@@ -57 +57 @@
 
 
-struct stat {
+typedef struct {
         fs_handle_t fs_handle;
         service_id_t service_id;
@@ -66 +66 @@
         aoff64_t size;
         service_id_t service;
-};
+} vfs_stat_t;
 
-struct statfs { 
+typedef struct {
         char fs_name[FS_NAME_MAXLEN + 1];
         uint32_t f_bsize;    /* fundamental file system block size */
         uint64_t f_blocks;   /* total data blocks in file system */
         uint64_t f_bfree;    /* free blocks in fs */
-};
+} vfs_statfs_t;
 
 /** List of file system types */
@@ -111 +111 @@
 extern int vfs_root(void);
 extern errno_t vfs_root_set(int);
-extern errno_t vfs_stat(int, struct stat *);
-extern errno_t vfs_stat_path(const char *, struct stat *);
-extern errno_t vfs_statfs(int, struct statfs *);
-extern errno_t vfs_statfs_path(const char *, struct statfs *);
+extern errno_t vfs_stat(int, vfs_stat_t *);
+extern errno_t vfs_stat_path(const char *, vfs_stat_t *);
+extern errno_t vfs_statfs(int, vfs_statfs_t *);
+extern errno_t vfs_statfs_path(const char *, vfs_statfs_t *);
 extern errno_t vfs_sync(int);
 extern errno_t vfs_unlink(int, const char *, int);

uspace/lib/fs/libfs.c

@@ -733 +733 @@
         size_t size;
         if ((!async_data_read_receive(&callid, &size)) ||
-            (size != sizeof(struct stat))) {
+            (size != sizeof(vfs_stat_t))) {
                 ops->node_put(fn);
                 async_answer_0(callid, EINVAL);
@@ -740 +740 @@
         }
 
-        struct stat stat;
-        memset(&stat, 0, sizeof(struct stat));
+        vfs_stat_t stat;
+        memset(&stat, 0, sizeof(vfs_stat_t));
 
         stat.fs_handle = fs_handle;
@@ -755 +755 @@
 
 
-        async_data_read_finalize(callid, &stat, sizeof(struct stat));
+        async_data_read_finalize(callid, &stat, sizeof(vfs_stat_t));
         async_answer_0(rid, EOK);
 }
@@ -772 +772 @@
         size_t size;
         if ((!async_data_read_receive(&callid, &size)) ||
-            (size != sizeof(struct statfs))) {
+            (size != sizeof(vfs_statfs_t))) {
                 goto error;
         }
 
-        struct statfs st;
-        memset(&st, 0, sizeof(struct statfs));
+        vfs_statfs_t st;
+        memset(&st, 0, sizeof(vfs_statfs_t));
 
         str_cpy(st.fs_name, sizeof(st.fs_name), fs_name);
@@ -800 +800 @@
 
         ops->node_put(fn);
-        async_data_read_finalize(callid, &st, sizeof(struct statfs));
+        async_data_read_finalize(callid, &st, sizeof(vfs_statfs_t));
         async_answer_0(rid, EOK);
         return;

uspace/lib/posix/source/sys/stat.c

@@ -52 +52 @@
  * @return 0 on success, -1 on error.
  */
-static int stat_to_posix(struct posix_stat *dest, struct stat *src)
+static int stat_to_posix(struct posix_stat *dest, vfs_stat_t *src)
 {
         memset(dest, 0, sizeof(struct posix_stat));
@@ -88 +88 @@
 int posix_fstat(int fd, struct posix_stat *st)
 {
-        struct stat hst;
+        vfs_stat_t hst;
         if (failed(vfs_stat(fd, &hst)))
                 return -1;
@@ -116 +116 @@
 int posix_stat(const char *restrict path, struct posix_stat *restrict st)
 {
-        struct stat hst;
+        vfs_stat_t hst;
         if (failed(vfs_stat_path(path, &hst)))
                 return -1;

uspace/lib/posix/source/unistd.c

@@ -245 +245 @@
 posix_off_t posix_lseek(int fildes, posix_off_t offset, int whence)
 {
-        struct stat st;
+        vfs_stat_t st;
 
         switch (whence) {