Changeset 96b02eb9 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2010-12-14T12:52:38Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

File:

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

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

@@ -158 +158 @@
         vfs_connect();
         
-        ipcarg_t rc_orig;
+        sysarg_t rc_orig;
         aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, devmap_handle, flags, NULL);
-        ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+        sysarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
                 async_wait_for(req, &rc_orig);
@@ -238 +238 @@
 int unmount(const char *mp)
 {
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
+        sysarg_t rc;
+        sysarg_t rc_orig;
         aid_t req;
         size_t mpa_size;
@@ -282 +282 @@
         ipc_call_t answer;
         aid_t req = async_send_3(vfs_phone, VFS_IN_OPEN, lflag, oflag, 0, &answer);
-        ipcarg_t rc = async_data_write_start(vfs_phone, abs, abs_size);
-        
-        if (rc != EOK) {
-                ipcarg_t rc_orig;
+        sysarg_t rc = async_data_write_start(vfs_phone, abs, abs_size);
+        
+        if (rc != EOK) {
+                sysarg_t rc_orig;
                 async_wait_for(req, &rc_orig);
                 
@@ -330 +330 @@
             node->devmap_handle, node->index, oflag, &answer);
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(req, &rc);
         async_serialize_end();
@@ -343 +343 @@
 int close(int fildes)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         
         futex_down(&vfs_phone_futex);
@@ -359 +359 @@
 ssize_t read(int fildes, void *buf, size_t nbyte) 
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         ipc_call_t answer;
         aid_t req;
@@ -370 +370 @@
         rc = async_data_read_start(vfs_phone, (void *)buf, nbyte);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
         
                 async_wait_for(req, &rc_orig);
@@ -391 +391 @@
 ssize_t write(int fildes, const void *buf, size_t nbyte) 
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         ipc_call_t answer;
         aid_t req;
@@ -402 +402 @@
         rc = async_data_write_start(vfs_phone, (void *)buf, nbyte);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
         
                 async_wait_for(req, &rc_orig);
@@ -427 +427 @@
         vfs_connect();
         
-        ipcarg_t rc = async_req_1_0(vfs_phone, VFS_IN_SYNC, fildes);
+        sysarg_t rc = async_req_1_0(vfs_phone, VFS_IN_SYNC, fildes);
         
         async_serialize_end();
@@ -441 +441 @@
         vfs_connect();
         
-        ipcarg_t newoff_lo;
-        ipcarg_t newoff_hi;
-        ipcarg_t rc = async_req_4_2(vfs_phone, VFS_IN_SEEK, fildes,
+        sysarg_t newoff_lo;
+        sysarg_t newoff_hi;
+        sysarg_t rc = async_req_4_2(vfs_phone, VFS_IN_SEEK, fildes,
             LOWER32(offset), UPPER32(offset), whence,
             &newoff_lo, &newoff_hi);
@@ -458 +458 @@
 int ftruncate(int fildes, aoff64_t length)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         
         futex_down(&vfs_phone_futex);
@@ -474 +474 @@
 int fstat(int fildes, struct stat *stat)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         aid_t req;
 
@@ -484 +484 @@
         rc = async_data_read_start(vfs_phone, (void *) stat, sizeof(struct stat));
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
                 
                 async_wait_for(req, &rc_orig);
@@ -503 +503 @@
 int stat(const char *path, struct stat *stat)
 {
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
+        sysarg_t rc;
+        sysarg_t rc_orig;
         aid_t req;
         
@@ -593 +593 @@
 int mkdir(const char *path, mode_t mode)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         aid_t req;
         
@@ -608 +608 @@
         rc = async_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
         
                 async_wait_for(req, &rc_orig);
@@ -628 +628 @@
 static int _unlink(const char *path, int lflag)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         aid_t req;
         
@@ -643 +643 @@
         rc = async_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
 
                 async_wait_for(req, &rc_orig);
@@ -673 +673 @@
 int rename(const char *old, const char *new)
 {
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
+        sysarg_t rc;
+        sysarg_t rc_orig;
         aid_t req;
         
@@ -810 +810 @@
         vfs_connect();
         
-        ipcarg_t ret;
-        ipcarg_t rc = async_req_2_1(vfs_phone, VFS_IN_DUP, oldfd, newfd, &ret);
+        sysarg_t ret;
+        sysarg_t rc = async_req_2_1(vfs_phone, VFS_IN_DUP, oldfd, newfd, &ret);
         
         async_serialize_end();