Changeset 67e881c in mainline for uspace/lib/c

Timestamp:

2017-03-30T20:59:36Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a56cef9

Parents:

79ea5af

Message:

Rename ftruncate() to vfs_resize()

Location:

uspace/lib/c

Files:

• generic/vfs/vfs.c (modified) (2 diffs)
• include/ipc/vfs.h (modified) (1 diff)
• include/unistd.h (modified) (1 diff)
• include/vfs/vfs.h (modified) (1 diff)

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

@@ -408 +408 @@
                 assert(!(oflag & O_APPEND));
                 
-                (void) ftruncate(fd, 0);
+                (void) vfs_resize(fd, 0);
         }
 
@@ -620 +620 @@
  * @param length Length
  *
- * @return 0 on success, -1 on error and sets errno.
- */
-int ftruncate(int fildes, aoff64_t length)
+ * @return 0 on success or a negative erroc code otherwise.
+ */
+int vfs_resize(int file, aoff64_t length)
 {
         sysarg_t rc;
         
         async_exch_t *exch = vfs_exchange_begin();
-        rc = async_req_3_0(exch, VFS_IN_TRUNCATE, fildes,
-            LOWER32(length), UPPER32(length));
-        vfs_exchange_end(exch);
-        
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-        
-        return 0;
+        rc = async_req_3_0(exch, VFS_IN_RESIZE, file, LOWER32(length),
+            UPPER32(length));
+        vfs_exchange_end(exch);
+        
+        return rc;
 }
 

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

@@ -65 +65 @@
         VFS_IN_READ = IPC_FIRST_USER_METHOD,
         VFS_IN_WRITE,
-        VFS_IN_TRUNCATE,
+        VFS_IN_RESIZE,
         VFS_IN_STAT,
         VFS_IN_CLOSE,

uspace/lib/c/include/unistd.h

@@ -61 +61 @@
 extern ssize_t read(int, aoff64_t *, void *, size_t);
 
-extern int ftruncate(int, aoff64_t);
-
 extern int close(int);
 extern int fsync(int);

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

@@ -90 +90 @@
 extern int vfs_root(void);
 extern void vfs_root_set(int);
+extern int vfs_resize(int, aoff64_t);
 extern int vfs_stat(int, struct stat *);
 extern int vfs_stat_path(const char *, struct stat *);