Changeset b5e68c8 in mainline for uspace/lib/c/generic/net/icmp_api.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/icmp_api.c (modified) (4 diffs)

uspace/lib/c/generic/net/icmp_api.c

@@ -41 +41 @@
 #include <net/modules.h>
 #include <net/ip_codes.h>
-
 #include <async.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
-
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/icmp.h>
@@ -66 +63 @@
  * @param[in] addr      The target host address.
  * @param[in] addrlen   The torget host address length.
- * @returns             ICMP_ECHO on success.
- * @returns             ETIMEOUT if the reply has not arrived before the
+ * @return              ICMP_ECHO on success.
+ * @return              ETIMEOUT if the reply has not arrived before the
  *                      timeout.
- * @returns             ICMP type of the received error notification.
- * @returns             EINVAL if the addrlen parameter is less or equal to
+ * @return              ICMP type of the received error notification.
+ * @return              EINVAL if the addrlen parameter is less or equal to
  *                      zero.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             EPARTY if there was an internal error.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              EPARTY if there was an internal error.
  */
 int
@@ -81 +78 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         if (addrlen <= 0)
@@ -87 +84 @@
 
         message_id = async_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl,
-            tos, (ipcarg_t) dont_fragment, NULL);
+            tos, (sysarg_t) dont_fragment, NULL);
 
-        // send the address
+        /* Send the address */
         async_data_write_start(icmp_phone, addr, (size_t) addrlen);