Changeset fe91f66 in mainline for uspace/lib/c

Timestamp:

2017-03-26T20:57:06Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b5b5d84

Parents:

fcab7ef

Message:

Omit unnecessary prefixes and suffixes from method and interface names

Location:

uspace/lib/c

Files:

• generic/vfs/vfs.c (modified) (6 diffs)
• include/ipc/vfs.h (modified) (2 diffs)

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

@@ -160 +160 @@
 {
         async_exch_t *exch = vfs_exchange_begin();
-        sysarg_t rc = async_req_2_0(exch, VFS_IN_OPEN2, fildes, mode);
+        sysarg_t rc = async_req_2_0(exch, VFS_IN_OPEN, fildes, mode);
         vfs_exchange_end(exch);
         
@@ -654 +654 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_1(exch, VFS_IN_FSTAT, fildes, NULL);
+        req = async_send_1(exch, VFS_IN_STAT, fildes, NULL);
         rc = async_data_read_start(exch, (void *) stat, sizeof(struct stat));
         if (rc != EOK) {
@@ -808 +808 @@
 }
 
-static int _vfs_unlink2(int parent, const char *path, int expect, int wflag)
+static int _vfs_unlink(int parent, const char *path, int expect, int wflag)
 {
         sysarg_t rc;
@@ -815 +815 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_3(exch, VFS_IN_UNLINK2, parent, expect, wflag, NULL);
+        req = async_send_3(exch, VFS_IN_UNLINK, parent, expect, wflag, NULL);
         rc = async_data_write_start(exch, path, str_size(path));
         
@@ -849 +849 @@
         }
         
-        int rc = _vfs_unlink2(root, pa, -1, 0);
+        int rc = _vfs_unlink(root, pa, -1, 0);
         
         if (rc != EOK) {
@@ -882 +882 @@
         }
         
-        int rc = _vfs_unlink2(root, pa, -1, WALK_DIRECTORY);
+        int rc = _vfs_unlink(root, pa, -1, WALK_DIRECTORY);
         if (rc != EOK) {
                 errno = rc;

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

@@ -66 +66 @@
         VFS_IN_WRITE,
         VFS_IN_TRUNCATE,
-        VFS_IN_FSTAT,
+        VFS_IN_STAT,
         VFS_IN_CLOSE,
         VFS_IN_MOUNT,
@@ -76 +76 @@
         VFS_IN_STATFS,
         VFS_IN_WALK,
-        VFS_IN_OPEN2,
-        VFS_IN_UNLINK2,
+        VFS_IN_OPEN,
+        VFS_IN_UNLINK,
         VFS_IN_CLONE,
 } vfs_in_request_t;