Changes in uspace/srv/ns/service.c [4f13e19:5e801dc] in mainline

File:

• uspace/srv/ns/service.c (modified) (5 diffs)

uspace/srv/ns/service.c

@@ -65 +65 @@
 } hashed_iface_t;
 
-static size_t service_key_hash(void *key)
-{
-        return *(service_t *) key;
+static size_t service_key_hash(const void *key)
+{
+        const service_t *srv = key;
+        return *srv;
 }
 
@@ -78 +79 @@
 }
 
-static bool service_key_equal(void *key, const ht_link_t *item)
-{
+static bool service_key_equal(const void *key, const ht_link_t *item)
+{
+        const service_t *srv = key;
         hashed_service_t *service =
             hash_table_get_inst(item, hashed_service_t, link);
 
-        return service->service == *(service_t *) key;
-}
-
-static size_t iface_key_hash(void *key)
-{
-        return *(iface_t *) key;
+        return service->service == *srv;
+}
+
+static size_t iface_key_hash(const void *key)
+{
+        const iface_t *iface = key;
+        return *iface;
 }
 
@@ -99 +102 @@
 }
 
-static bool iface_key_equal(void *key, const ht_link_t *item)
-{
+static bool iface_key_equal(const void *key, const ht_link_t *item)
+{
+        const iface_t *kiface = key;
         hashed_iface_t *iface =
             hash_table_get_inst(item, hashed_iface_t, link);
 
-        return iface->iface == *(iface_t *) key;
+        return iface->iface == *kiface;
 }
 
@@ -154 +158 @@
 {
         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 +370 @@
 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;