Changeset ab87db5 in mainline for uspace/srv/net/inetsrv

Timestamp:

2019-02-23T17:16:01Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

Location:

uspace/srv/net/inetsrv

Files:

• inetcfg.c (modified) (10 diffs)
• inetping.c (modified) (2 diffs)
• inetsrv.c (modified) (4 diffs)

uspace/srv/net/inetsrv/inetcfg.c

@@ -257 +257 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_create_static_srv()");
 
-        sysarg_t link_id = IPC_GET_ARG1(*icall);
+        sysarg_t link_id = ipc_get_arg1(icall);
 
         ipc_call_t call;
@@ -302 +302 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_delete_srv()");
 
-        addr_id = IPC_GET_ARG1(*call);
+        addr_id = ipc_get_arg1(call);
 
         rc = inetcfg_addr_delete(addr_id);
@@ -312 +312 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()");
 
-        sysarg_t addr_id = IPC_GET_ARG1(*icall);
+        sysarg_t addr_id = ipc_get_arg1(icall);
 
         inet_addr_info_t ainfo;
@@ -375 +375 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_id_srv()");
 
-        link_id = IPC_GET_ARG1(*call);
+        link_id = ipc_get_arg1(call);
 
         rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
@@ -499 +499 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_add_srv()");
 
-        link_id = IPC_GET_ARG1(*call);
+        link_id = ipc_get_arg1(call);
 
         rc = inetcfg_link_add(link_id);
@@ -516 +516 @@
         errno_t rc;
 
-        link_id = IPC_GET_ARG1(*call);
+        link_id = ipc_get_arg1(call);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_get_srv()");
 
@@ -566 +566 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_remove_srv()");
 
-        link_id = IPC_GET_ARG1(*call);
+        link_id = ipc_get_arg1(call);
 
         rc = inetcfg_link_remove(link_id);
@@ -639 +639 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_delete_srv()");
 
-        sroute_id = IPC_GET_ARG1(*call);
+        sroute_id = ipc_get_arg1(call);
 
         rc = inetcfg_sroute_delete(sroute_id);
@@ -649 +649 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()");
 
-        sysarg_t sroute_id = IPC_GET_ARG1(*icall);
+        sysarg_t sroute_id = ipc_get_arg1(icall);
 
         inet_sroute_info_t srinfo;
@@ -747 +747 @@
                 ipc_call_t call;
                 async_get_call(&call);
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                sysarg_t method = ipc_get_imethod(&call);
 
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "method %d", (int)method);

uspace/srv/net/inetsrv/inetping.c

@@ -143 +143 @@
         errno_t rc;
 
-        sdu.seq_no = IPC_GET_ARG1(*icall);
+        sdu.seq_no = ipc_get_arg1(icall);
 
         ipc_call_t call;
@@ -294 +294 @@
                 ipc_call_t call;
                 async_get_call(&call);
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                sysarg_t method = ipc_get_imethod(&call);
 
                 if (!method) {

uspace/srv/net/inetsrv/inetsrv.c

@@ -233 +233 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srcaddr_srv()");
 
-        uint8_t tos = IPC_GET_ARG1(*icall);
+        uint8_t tos = ipc_get_arg1(icall);
 
         ipc_call_t call;
@@ -291 +291 @@
         inet_dgram_t dgram;
 
-        dgram.iplink = IPC_GET_ARG1(*icall);
-        dgram.tos = IPC_GET_ARG2(*icall);
-
-        uint8_t ttl = IPC_GET_ARG3(*icall);
-        int df = IPC_GET_ARG4(*icall);
+        dgram.iplink = ipc_get_arg1(icall);
+        dgram.tos = ipc_get_arg2(icall);
+
+        uint8_t ttl = ipc_get_arg3(icall);
+        int df = ipc_get_arg4(icall);
 
         ipc_call_t call;
@@ -352 +352 @@
         sysarg_t proto;
 
-        proto = IPC_GET_ARG1(*call);
+        proto = ipc_get_arg1(call);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_set_proto_srv(%lu)", (unsigned long) proto);
 
@@ -397 +397 @@
                 ipc_call_t call;
                 async_get_call(&call);
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                sysarg_t method = ipc_get_imethod(&call);
 
                 if (!method) {