Changeset 132ab5d1 in mainline for uspace/lib/hound/src/protocol.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/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.
- * @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)
+ *
+ * @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)
 {
         assert(sess);
@@ -134 +137 @@
 
         if (ret == EOK)
-                async_wait_for(mid, (sysarg_t *)&ret);
+                async_wait_for(mid, &ret);
 
         async_exchange_end(exch);
-        return ret == EOK ? (hound_context_id_t)IPC_GET_ARG1(call) : ret;
+        if (ret == EOK) {
+                *id = (hound_context_id_t)IPC_GET_ARG1(call);
+        }
+
+        return ret;
 }
 
@@ -182 +189 @@
         ipc_call_t res_call;
         aid_t mid = async_send_3(exch, IPC_M_HOUND_GET_LIST, flags, *count,
-            (bool)connection, &res_call);
+            connection != NULL, &res_call);
 
         int ret = EOK;
@@ -190 +197 @@
 
         if (ret == EOK)
-                async_wait_for(mid, (sysarg_t*)&ret);
+                async_wait_for(mid, &ret);
 
         if (ret != EOK) {
@@ -257 +264 @@
         if (ret == EOK)
                 ret = async_data_write_start(exch, sink, str_size(sink));
-        async_wait_for(id, (sysarg_t*)&ret);
+        async_wait_for(id, &ret);
         async_exchange_end(exch);
         return ret;
@@ -283 +290 @@
         if (ret == EOK)
                 ret = async_data_write_start(exch, sink, str_size(sink));
-        async_wait_for(id, (sysarg_t*)&ret);
+        async_wait_for(id, &ret);
         async_exchange_end(exch);
         return ENOTSUP;