Changeset a676574 in mainline for uspace/lib/c/generic/net/modules.c

Timestamp:

2011-01-09T12:18:00Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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 mainline changes.

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);
@@ -214 +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);
@@ -224 +224 @@
         }
 
-        // send the data
+        /* Send the data */
         return async_data_read_finalize(callid, data, data_length);
 }
@@ -242 +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);