Changeset 25a179e in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-12-20T19:51:45Z (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:

f96b6c8

Parents:

d4a829e

Message:

IPC return values are always errno constants. Adjust types to reflect that.

In principle, IPC server is not allowed to return non-errno values via
the "main" return value, because kernel interprets it (e.g. EHANGUP).
It's still possible to return arbitrary additional return values alongside EOK,
which are not interpreted in normal communication.

File:

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

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

@@ -375 +375 @@
     vfs_fs_probe_info_t *info)
 {
-        sysarg_t rc;
+        int rc;
         
         ipc_call_t answer;
@@ -616 +616 @@
     unsigned int flags, unsigned int instance, int *mountedfd)
 {
-        sysarg_t rc, rc1;
+        int rc, rc1;
         
         if (!mountedfd)
@@ -810 +810 @@
 
         sysarg_t ret;
-        sysarg_t rc = async_req_1_1(vfs_exch, VFS_IN_WAIT_HANDLE, high, &ret);
+        int rc = async_req_1_1(vfs_exch, VFS_IN_WAIT_HANDLE, high, &ret);
 
         async_exchange_end(vfs_exch);
@@ -879 +879 @@
     ssize_t *nread)
 {
-        sysarg_t rc;
+        int rc;
         ipc_call_t answer;
         aid_t req;
@@ -920 +920 @@
 int vfs_rename_path(const char *old, const char *new)
 {
-        sysarg_t rc;
-        sysarg_t rc_orig;
+        int rc;
+        int rc_orig;
         aid_t req;
         
@@ -1051 +1051 @@
 int vfs_stat(int file, struct stat *stat)
 {
-        sysarg_t rc;
+        int rc;
         aid_t req;
         
@@ -1061 +1061 @@
                 vfs_exchange_end(exch);
                 
-                sysarg_t rc_orig;
+                int rc_orig;
                 async_wait_for(req, &rc_orig);
                 
@@ -1106 +1106 @@
 int vfs_statfs(int file, struct statfs *st)
 {
-        sysarg_t rc, ret;
+        int rc, ret;
         aid_t req;
 
@@ -1173 +1173 @@
 int vfs_unlink(int parent, const char *child, int expect)
 {
-        sysarg_t rc;
+        int rc;
         aid_t req;
         
@@ -1183 +1183 @@
         vfs_exchange_end(exch);
         
-        sysarg_t rc_orig;
+        int rc_orig;
         async_wait_for(req, &rc_orig);
         
@@ -1270 +1270 @@
         ipc_call_t answer;
         aid_t req = async_send_2(exch, VFS_IN_WALK, parent, flags, &answer);
-        sysarg_t rc = async_data_write_start(exch, path, str_size(path));
+        int rc = async_data_write_start(exch, path, str_size(path));
         vfs_exchange_end(exch);
                 
-        sysarg_t rc_orig;
+        int rc_orig;
         async_wait_for(req, &rc_orig);
 
@@ -1343 +1343 @@
     ssize_t *nwritten)
 {
-        sysarg_t rc;
+        int rc;
         ipc_call_t answer;
         aid_t req;