Changeset fed5a9b in mainline

Timestamp:

2017-12-08T21:03:35Z (6 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:

125c09c

Parents:

a8c7a6d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 03:29:45)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Fix error handling in libhound.

Location:

uspace/lib/hound

Files:

• include/hound/protocol.h (modified) (1 diff)
• src/client.c (modified) (1 diff)
• src/protocol.c (modified) (7 diffs)

uspace/lib/hound/include/hound/protocol.h

@@ -58 +58 @@
 typedef intptr_t hound_context_id_t;
 
-/**
- * Check context id for errors.
- * @param id Context id
- * @return Error code.
- */
-static inline int hound_context_id_err(hound_context_id_t id)
-{
-        return id > 0 ? EOK : (id == 0 ? ENOENT : id);
-}
-
 hound_sess_t *hound_service_connect(const char *service);
 void hound_service_disconnect(hound_sess_t *sess);
 
-hound_context_id_t hound_service_register_context(hound_sess_t *sess,
-    const char *name, bool record);
+int hound_service_register_context(hound_sess_t *sess,
+    const char *name, bool record, hound_context_id_t *id);
 int hound_service_unregister_context(hound_sess_t *sess, hound_context_id_t id);
 

uspace/lib/hound/src/client.c

@@ -123 +123 @@
                         return NULL;
                 }
-                new_context->id = hound_service_register_context(
-                    new_context->session, new_context->name, record);
-                if (hound_context_id_err(new_context->id) != EOK) {
+                int rc = hound_service_register_context(
+                    new_context->session, new_context->name, record,
+                    &new_context->id);
+                if (rc != EOK) {
                         hound_service_disconnect(new_context->session);
                         free(new_context->name);

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);
@@ -126 +129 @@
         aid_t mid =
             async_send_1(exch, IPC_M_HOUND_CONTEXT_REGISTER, record, &call);
-        int ret = mid ? EOK : EPARTY;
+        sysarg_t ret = mid ? EOK : EPARTY;
 
         if (ret == EOK)
@@ -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;
 }
 
@@ -184 +191 @@
             (bool)connection, &res_call);
 
-        int ret = EOK;
+        sysarg_t ret = EOK;
         if (mid && connection)
                 ret = async_data_write_start(exch, connection,
@@ -190 +197 @@
 
         if (ret == EOK)
-                async_wait_for(mid, (sysarg_t*)&ret);
+                async_wait_for(mid, &ret);
 
         if (ret != EOK) {
@@ -252 +259 @@
         ipc_call_t call;
         aid_t id = async_send_0(exch, IPC_M_HOUND_CONNECT, &call);
-        int ret = id ? EOK : EPARTY;
+        sysarg_t ret = id ? EOK : EPARTY;
         if (ret == EOK)
                 ret = async_data_write_start(exch, source, str_size(source));
         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;
@@ -278 +285 @@
         ipc_call_t call;
         aid_t id = async_send_0(exch, IPC_M_HOUND_DISCONNECT, &call);
-        int ret = id ? EOK : EPARTY;
+        sysarg_t ret = id ? EOK : EPARTY;
         if (ret == EOK)
                 ret = async_data_write_start(exch, source, str_size(source));
         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;