Changeset 132ab5d1 in mainline for uspace/lib/c/generic/inetcfg.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/generic/inetcfg.c (modified) (16 diffs)

uspace/lib/c/generic/inetcfg.c

@@ -55 +55 @@
         }
 
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
 
@@ -74 +74 @@
  * @param data          Place to store pointer to array of IDs
  * @param count         Place to store number of IDs
- * @return              EOK on success or negative error code
+ * @return              EOK on success or an error code
  */
 static int inetcfg_get_ids_internal(sysarg_t method, sysarg_t arg1,
@@ -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);