Changeset 163fc09 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-04-02T11:47:52Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ce04ea44

Parents:

151f1cc

Message:

Rename rename() to vfs_rename_path()

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (7 diffs)

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

@@ -833 +833 @@
  * @param new New name
  *
- * @return 0 on success. On error returns -1 and sets errno.
- */
-int rename(const char *old, const char *new)
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_rename_path(const char *old, const char *new)
 {
         sysarg_t rc;
@@ -843 +843 @@
         size_t olda_size;
         char *olda = vfs_absolutize(old, &olda_size);
-        if (olda == NULL) {
-                errno = ENOMEM;
-                return -1;
-        }
+        if (olda == NULL)
+                return ENOMEM;
 
         size_t newa_size;
@@ -852 +850 @@
         if (newa == NULL) {
                 free(olda);
-                errno = ENOMEM;
-                return -1;
+                return ENOMEM;
         }
         
@@ -861 +858 @@
                 free(olda);
                 free(newa);
-                errno = ENOENT;
-                return -1;
+                return ENOENT;
         }
         
@@ -875 +871 @@
                 if (rc_orig != EOK)
                         rc = rc_orig;
-                if (rc != EOK) {
-                        errno = rc;
-                        return -1;
-                }
-                return 0;
+                return rc;
         }
         rc = async_data_write_start(exch, newa, newa_size);
@@ -890 +882 @@
                 if (rc_orig != EOK)
                         rc = rc_orig;
-                if (rc != EOK) {
-                        errno = rc;
-                        return -1;
-                }
-                return 0;
+                return rc;
         }
         vfs_exchange_end(exch);
@@ -902 +890 @@
         async_wait_for(req, &rc);
 
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-
-        return 0;
+        return rc;
 }