Changes in uspace/lib/c/generic/net/modules.c [228e490:45bb1d2] in mainline

File:

• uspace/lib/c/generic/net/modules.c (modified) (6 diffs)

uspace/lib/c/generic/net/modules.c

@@ -63 +63 @@
     int answer_count)
 {
-        // choose the most efficient answer function
+        /* Choose the most efficient answer function */
         if (answer || (!answer_count)) {
                 switch (answer_count) {
@@ -178 +178 @@
         int phone;
 
-        // if no timeout is set
+        /* If no timeout is set */
         if (timeout <= 0)
                 return async_connect_me_to_blocking(PHONE_NS, need, 0, 0);
@@ -187 +187 @@
                         return phone;
 
-                // end if no time is left
+                /* Abort if no time is left */
                 if (timeout <= 0)
                         return ETIMEOUT;
 
-                // wait the minimum of the module wait time and the timeout
+                /* Wait the minimum of the module wait time and the timeout */
                 usleep((timeout <= MODULE_WAIT_TIME) ?
                     timeout : MODULE_WAIT_TIME);
                 timeout -= MODULE_WAIT_TIME;
         }
-}
-
-/** Receives data from the other party.
- *
- * The received data buffer is allocated and returned.
- *
- * @param[out] data     The data buffer to be filled.
- * @param[out] length   The buffer length.
- * @return              EOK on success.
- * @return              EBADMEM if the data or the length parameter is NULL.
- * @return              EINVAL if the client does not send data.
- * @return              ENOMEM if there is not enough memory left.
- * @return              Other error codes as defined for the
- *                      async_data_write_finalize() function.
- */
-int data_receive(void **data, size_t *length)
-{
-        ipc_callid_t callid;
-        int rc;
-
-        if (!data || !length)
-                return EBADMEM;
-
-        // fetch the request
-        if (!async_data_write_receive(&callid, length))
-                return EINVAL;
-
-        // allocate the buffer
-        *data = malloc(*length);
-        if (!*data)
-                return ENOMEM;
-
-        // fetch the data
-        rc = async_data_write_finalize(callid, *data, *length);
-        if (rc != EOK) {
-                free(data);
-                return rc;
-        }
-
-        return EOK;
 }
 
@@ -254 +214 @@
         ipc_callid_t callid;
 
-        // fetch the request
+        /* Fetch the request */
         if (!async_data_read_receive(&callid, &length))
                 return EINVAL;
 
-        // check the requested data size
+        /* Check the requested data size */
         if (length < data_length) {
                 async_data_read_finalize(callid, data, length);
@@ -264 +224 @@
         }
 
-        // send the data
+        /* Send the data */
         return async_data_read_finalize(callid, data, data_length);
 }
@@ -282 +242 @@
         if (answer) {
                 IPC_SET_RETVAL(*answer, 0);
-                // just to be precize
+                /* Just to be precise */
                 IPC_SET_IMETHOD(*answer, 0);
                 IPC_SET_ARG1(*answer, 0);