Changeset eb13ef8 in mainline for uspace/srv/ns

Timestamp:

2019-02-06T13:25:12Z (7 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:

fafb8e5

Parents:

bb97118

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 14:04:02)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)

Message:

Change IPC_GET_* and IPC_SET_* to accept pointer instead of lvalue

Location:

uspace/srv/ns

Files:

• clonable.c (modified) (1 diff)
• ns.c (modified) (6 diffs)
• service.c (modified) (2 diffs)
• task.c (modified) (2 diffs)

uspace/srv/ns/clonable.c

@@ -95 +95 @@
         async_exch_t *exch = async_exchange_begin(sess);
         async_forward_1(&csr->call, exch, csr->iface,
-            IPC_GET_ARG3(csr->call), IPC_FF_NONE);
+            IPC_GET_ARG3(&csr->call), IPC_FF_NONE);
         async_exchange_end(exch);
 

uspace/srv/ns/ns.c

@@ -55 +55 @@
         service_t service;
 
-        iface = IPC_GET_ARG1(*icall);
-        service = IPC_GET_ARG2(*icall);
+        iface = IPC_GET_ARG1(icall);
+        service = IPC_GET_ARG2(icall);
         if (service != 0) {
                 /*
@@ -76 +76 @@
 
                 async_get_call(&call);
-                if (!IPC_GET_IMETHOD(call))
+                if (!IPC_GET_IMETHOD(&call))
                         break;
 
@@ -84 +84 @@
                 service_t service;
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_IMETHOD(&call)) {
                 case NS_REGISTER:
-                        service = IPC_GET_ARG1(call);
-                        iface = IPC_GET_ARG2(call);
+                        service = IPC_GET_ARG1(&call);
+                        iface = IPC_GET_ARG2(&call);
 
                         /*
@@ -101 +101 @@
                         break;
                 case NS_REGISTER_BROKER:
-                        service = IPC_GET_ARG1(call);
+                        service = IPC_GET_ARG1(&call);
                         retval = ns_service_register_broker(service);
                         break;
@@ -109 +109 @@
                 case NS_TASK_WAIT:
                         id = (task_id_t)
-                            MERGE_LOUP32(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
+                            MERGE_LOUP32(IPC_GET_ARG1(&call), IPC_GET_ARG2(&call));
                         wait_for_task(id, &call);
                         continue;
@@ -120 +120 @@
                 default:
                         printf("%s: Method not supported (%" PRIun ")\n",
-                            NAME, IPC_GET_IMETHOD(call));
+                            NAME, IPC_GET_IMETHOD(&call));
                         retval = ENOTSUP;
                         break;

uspace/srv/ns/service.c

@@ -154 +154 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        async_forward_1(call, exch, iface, IPC_GET_ARG3(*call), IPC_FF_NONE);
+        async_forward_1(call, exch, iface, IPC_GET_ARG3(call), IPC_FF_NONE);
         async_exchange_end(exch);
 }
@@ -366 +366 @@
 void ns_service_forward(service_t service, iface_t iface, ipc_call_t *call)
 {
-        sysarg_t flags = IPC_GET_ARG4(*call);
+        sysarg_t flags = IPC_GET_ARG4(call);
         errno_t retval;
 

uspace/srv/ns/task.c

@@ -225 +225 @@
 errno_t ns_task_id_intro(ipc_call_t *call)
 {
-        task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
+        task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
 
         ht_link_t *link = hash_table_find(&phone_to_id, &call->request_label);
@@ -289 +289 @@
         ht->finished = true;
         ht->have_rval = true;
-        ht->retval = IPC_GET_ARG1(*call);
+        ht->retval = IPC_GET_ARG1(call);
 
         process_pending_wait();