Changeset b77ce84 in mainline for uspace/lib/net/generic/generic.c

Timestamp:

2011-04-13T17:27:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

34e8bab, a0a134b

Parents:

8b4ce802 (diff), 17279ead (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/net/generic/generic.c (modified) (4 diffs)

uspace/lib/net/generic/generic.c

@@ -106 +106 @@
                 return EBADMEM;
 
-        // request the address
+        /* Request the address */
         message_id = async_send_1(phone, (sysarg_t) message,
             (sysarg_t) device_id, NULL);
@@ -112 +112 @@
         async_wait_for(message_id, &result);
 
-        // if not successful
+        /* If not successful */
         if ((string == EOK) && (result != EOK)) {
-                // clear the data
+                /* Clear the data */
                 free(*address);
                 free(*data);
@@ -242 +242 @@
                 return EBADMEM;
 
-        // request the translation
+        /* Request the translation */
         message_id = async_send_3(phone, (sysarg_t) message,
             (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
@@ -249 +249 @@
         async_wait_for(message_id, &result);
 
-        // if not successful
+        /* If not successful */
         if ((string == EOK) && (result != EOK)) {
-                // clear the data
+                /* Clear the data */
                 free(*translation);
                 free(*data);