Changeset 8b655705 in mainline for uspace/lib/net/generic/generic.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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) (5 diffs)

uspace/lib/net/generic/generic.c

@@ -36 +36 @@
 
 #include <generic.h>
-
 #include <async.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <net/device.h>
 #include <adt/measured_strings.h>
@@ -109 +106 @@
                 return EBADMEM;
 
-        // request the address
+        /* Request the address */
         message_id = async_send_1(phone, (sysarg_t) message,
             (sysarg_t) device_id, NULL);
@@ -115 +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);
@@ -245 +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);
@@ -252 +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);