Changeset 25a179e in mainline for uspace/lib/c/generic/inetcfg.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/inetcfg.c (modified) (15 diffs)

uspace/lib/c/generic/inetcfg.c

@@ -55 +55 @@
         }
 
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
 
@@ -158 +158 @@
         }
         
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         
         *addr_id = IPC_GET_ARG1(answer);
         
-        return (int) retval;
+        return retval;
 }
 
@@ -187 +187 @@
             sizeof(inet_naddr_t), &answer_naddr);
         
-        sysarg_t retval_naddr;
+        int retval_naddr;
         async_wait_for(req_naddr, &retval_naddr);
         
@@ -193 +193 @@
                 async_exchange_end(exch);
                 async_forget(req);
-                return (int) retval_naddr;
+                return retval_naddr;
         }
         
@@ -203 +203 @@
         async_exchange_end(exch);
         
-        sysarg_t retval_name;
+        int retval_name;
         async_wait_for(req_name, &retval_name);
         
         if (retval_name != EOK) {
                 async_forget(req);
-                return (int) retval_name;
-        }
-        
-        sysarg_t retval;
+                return retval_name;
+        }
+        
+        int retval;
         async_wait_for(req, &retval);
         
         if (retval != EOK)
-                return (int) retval;
+                return retval;
         
         size_t act_size = IPC_GET_ARG2(answer_name);
@@ -234 +234 @@
         ipc_call_t answer;
         aid_t req = async_send_1(exch, INETCFG_ADDR_GET_ID, link_id, &answer);
-        sysarg_t retval = async_data_write_start(exch, name, str_size(name));
+        int retval = async_data_write_start(exch, name, str_size(name));
 
         async_exchange_end(exch);
@@ -280 +280 @@
 {
         ipc_call_t dreply;
-        sysarg_t dretval;
+        int dretval;
         size_t act_size;
         char name_buf[LOC_NAME_MAXLEN + 1];
@@ -299 +299 @@
         }
 
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
 
@@ -356 +356 @@
         }
         
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         
         *sroute_id = IPC_GET_ARG1(answer);
         
-        return (int) retval;
+        return retval;
 }
 
@@ -385 +385 @@
             sizeof(inet_naddr_t), &answer_dest);
         
-        sysarg_t retval_dest;
+        int retval_dest;
         async_wait_for(req_dest, &retval_dest);
         
@@ -391 +391 @@
                 async_exchange_end(exch);
                 async_forget(req);
-                return (int) retval_dest;
+                return retval_dest;
         }
         
@@ -398 +398 @@
             sizeof(inet_addr_t), &answer_router);
         
-        sysarg_t retval_router;
+        int retval_router;
         async_wait_for(req_router, &retval_router);
         
@@ -404 +404 @@
                 async_exchange_end(exch);
                 async_forget(req);
-                return (int) retval_router;
+                return retval_router;
         }
         
@@ -414 +414 @@
         async_exchange_end(exch);
         
-        sysarg_t retval_name;
+        int retval_name;
         async_wait_for(req_name, &retval_name);
         
         if (retval_name != EOK) {
                 async_forget(req);
-                return (int) retval_name;
-        }
-        
-        sysarg_t retval;
+                return retval_name;
+        }
+        
+        int retval;
         async_wait_for(req, &retval);
         
         if (retval != EOK)
-                return (int) retval;
+                return retval;
         
         size_t act_size = IPC_GET_ARG2(answer_name);
@@ -444 +444 @@
         ipc_call_t answer;
         aid_t req = async_send_0(exch, INETCFG_SROUTE_GET_ID, &answer);
-        sysarg_t retval = async_data_write_start(exch, name, str_size(name));
+        int retval = async_data_write_start(exch, name, str_size(name));
 
         async_exchange_end(exch);