Changeset 132ab5d1 in mainline for uspace/srv/net/inetsrv/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/srv/net/inetsrv/inetcfg.c (modified) (6 diffs)

uspace/srv/net/inetsrv/inetcfg.c

@@ -364 +364 @@
         }
         
-        async_answer_1(iid, (sysarg_t) rc, ainfo.ilink);
+        async_answer_1(iid, rc, ainfo.ilink);
 }
 
@@ -419 +419 @@
         size = min(act_size, max_size);
 
-        sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size);
+        int retval = async_data_read_finalize(rcallid, id_buf, size);
         free(id_buf);
 
@@ -453 +453 @@
         size = min(act_size, max_size);
 
-        sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size);
+        int retval = async_data_read_finalize(rcallid, id_buf, size);
         free(id_buf);
 
@@ -487 +487 @@
         size = min(act_size, max_size);
 
-        sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size);
+        int retval = async_data_read_finalize(rcallid, id_buf, size);
         free(id_buf);
 
@@ -542 +542 @@
         }
 
-        sysarg_t retval = async_data_read_finalize(name_callid, linfo.name,
+        int retval = async_data_read_finalize(name_callid, linfo.name,
             min(name_max_size, str_size(linfo.name)));
         if (retval != EOK) {
@@ -714 +714 @@
         free(srinfo.name);
         
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }