Changes in uspace/lib/hound/src/protocol.c [25a179e:cf13b17] in mainline

File:

• uspace/lib/hound/src/protocol.c (modified) (6 diffs)

uspace/lib/hound/src/protocol.c

@@ -115 +115 @@
  * @param name Valid string identifier
  * @param record True if the application context wishes to receive data.
- *
- * @param[out] id  Return context ID.
- *
- * @return EOK on success, Error code on failure.
- */
-int hound_service_register_context(hound_sess_t *sess,
-    const char *name, bool record, hound_context_id_t *id)
+ * @return Valid ID on success, Error code on failure.
+ */
+hound_context_id_t hound_service_register_context(hound_sess_t *sess,
+    const char *name, bool record)
 {
         assert(sess);
@@ -137 +134 @@
 
         if (ret == EOK)
-                async_wait_for(mid, &ret);
+                async_wait_for(mid, (sysarg_t *)&ret);
 
         async_exchange_end(exch);
-        if (ret == EOK) {
-                *id = (hound_context_id_t)IPC_GET_ARG1(call);
-        }
-
-        return ret;
+        return ret == EOK ? (hound_context_id_t)IPC_GET_ARG1(call) : ret;
 }
 
@@ -189 +182 @@
         ipc_call_t res_call;
         aid_t mid = async_send_3(exch, IPC_M_HOUND_GET_LIST, flags, *count,
-            connection != NULL, &res_call);
+            (bool)connection, &res_call);
 
         int ret = EOK;
@@ -197 +190 @@
 
         if (ret == EOK)
-                async_wait_for(mid, &ret);
+                async_wait_for(mid, (sysarg_t*)&ret);
 
         if (ret != EOK) {
@@ -264 +257 @@
         if (ret == EOK)
                 ret = async_data_write_start(exch, sink, str_size(sink));
-        async_wait_for(id, &ret);
+        async_wait_for(id, (sysarg_t*)&ret);
         async_exchange_end(exch);
         return ret;
@@ -290 +283 @@
         if (ret == EOK)
                 ret = async_data_write_start(exch, sink, str_size(sink));
-        async_wait_for(id, &ret);
+        async_wait_for(id, (sysarg_t*)&ret);
         async_exchange_end(exch);
         return ENOTSUP;