Changes in uspace/lib/libc/generic/async.c [8aa42e3:0da4e41] in mainline

File:

• uspace/lib/libc/generic/async.c (modified) (3 diffs)

uspace/lib/libc/generic/async.c

@@ -392 +392 @@
         /* If nothing in queue, wait until something arrives */
         while (list_empty(&conn->msg_queue)) {
-                if (conn->close_callid) {
-                        /*
-                         * Handle the case when the connection was already
-                         * closed by the client but the server did not notice
-                         * the first IPC_M_PHONE_HUNGUP call and continues to
-                         * call async_get_call_timeout(). Repeat
-                         * IPC_M_PHONE_HUNGUP until the caller notices. 
-                         */
-                        memset(call, 0, sizeof(ipc_call_t));
-                        IPC_SET_METHOD(*call, IPC_M_PHONE_HUNGUP);
-                        futex_up(&async_futex);
-                        return conn->close_callid;
-                }
-
                 if (usecs)
                         async_insert_timeout(&conn->wdata);
@@ -542 +528 @@
         list_initialize(&conn->msg_queue);
         conn->callid = callid;
-        conn->close_callid = 0;
+        conn->close_callid = false;
         
         if (call)
@@ -1345 +1331 @@
 }
 
-/** Wrapper for receiving blobs via the async_data_write_*
- *
- * This wrapper only makes it more comfortable to use async_data_write_*
- * functions to receive blobs.
- *
- * @param blob     Pointer to data pointer (which should be later disposed
- *                 by free()). If the operation fails, the pointer is not
- *                 touched.
- * @param max_size Maximum size (in bytes) of the blob to receive. 0 means
- *                 no limit.
- * @param received If not NULL, the size of the received data is stored here.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int async_data_blob_receive(char **blob, const size_t max_size, size_t *received)
-{
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                return EINVAL;
-        }
-        
-        if ((max_size > 0) && (size > max_size)) {
-                ipc_answer_0(callid, EINVAL);
-                return EINVAL;
-        }
-        
-        char *data = (char *) malloc(size);
-        if (data == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                return ENOMEM;
-        }
-        
-        int rc = async_data_write_finalize(callid, data, size);
-        if (rc != EOK) {
-                free(data);
-                return rc;
-        }
-        
-        *blob = data;
-        if (received != NULL)
-                *received = size;
-        
-        return EOK;
-}
-
-/** Wrapper for receiving strings via the async_data_write_*
- *
- * This wrapper only makes it more comfortable to use async_data_write_*
- * functions to receive strings.
- *
- * @param str      Pointer to string pointer (which should be later disposed
- *                 by free()). If the operation fails, the pointer is not
- *                 touched.
- * @param max_size Maximum size (in bytes) of the string to receive. 0 means
- *                 no limit.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int async_data_string_receive(char **str, const size_t max_size)
-{
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                return EINVAL;
-        }
-        
-        if ((max_size > 0) && (size > max_size)) {
-                ipc_answer_0(callid, EINVAL);
-                return EINVAL;
-        }
-        
-        char *data = (char *) malloc(size + 1);
-        if (data == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                return ENOMEM;
-        }
-        
-        int rc = async_data_write_finalize(callid, data, size);
-        if (rc != EOK) {
-                free(data);
-                return rc;
-        }
-        
-        data[size] = 0;
-        *str = data;
-        return EOK;
-}
-
 /** @}
  */