Changeset a7811f17 in mainline for uspace/srv/net/tl/icmp/icmp.c

Timestamp:

2010-11-19T21:28:02Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a9c6b966

Parents:

45f04f8 (diff), aaa3f33a (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 xxx_ref typedefs removal.

File:

• uspace/srv/net/tl/icmp/icmp.c (modified) (14 diffs)

uspace/srv/net/tl/icmp/icmp.c

@@ -156 +156 @@
  */
 static int icmp_send_packet(icmp_type_t type, icmp_code_t code, packet_t packet,
-    icmp_header_ref header, services_t error, ip_ttl_t ttl, ip_tos_t tos,
+    icmp_header_t *header, services_t error, ip_ttl_t ttl, ip_tos_t tos,
     int dont_fragment)
 {
@@ -189 +189 @@
  * @returns NULL on errors.
  */
-static icmp_header_ref icmp_prepare_packet(packet_t packet)
-{
-        icmp_header_ref header;
+static icmp_header_t *icmp_prepare_packet(packet_t packet)
+{
+        icmp_header_t *header;
         size_t header_length;
         size_t total_length;
@@ -247 +247 @@
     const struct sockaddr * addr, socklen_t addrlen)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
         packet_t packet;
         size_t length;
         uint8_t *data;
-        icmp_reply_ref reply;
+        icmp_reply_t *reply;
         int reply_key;
         int index;
@@ -342 +342 @@
     icmp_code_t code, icmp_param_t mtu, packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -357 +357 @@
 static int icmp_source_quench_msg_local(int icmp_phone, packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -370 +370 @@
     packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -383 +383 @@
     icmp_param_t pointer, packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -413 +413 @@
                 }
         };
-        measured_string_ref configuration;
+        measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
         char *data;
@@ -479 +479 @@
  * @param[in] code      The received reply message code.
  */
-static void  icmp_process_echo_reply(packet_t packet, icmp_header_ref header,
+static void  icmp_process_echo_reply(packet_t packet, icmp_header_t *header,
     icmp_type_t type, icmp_code_t code)
 {
         int reply_key;
-        icmp_reply_ref reply;
+        icmp_reply_t *reply;
 
         /* Compute the reply key */
@@ -525 +525 @@
         int result;
         void *data;
-        icmp_header_ref header;
+        icmp_header_t *header;
         icmp_type_t type;
         icmp_code_t code;
@@ -567 +567 @@
 
         /* Get ICMP header */
-        header = (icmp_header_ref) data;
+        header = (icmp_header_t *) data;
 
         if (header->checksum) {
@@ -735 +735 @@
  * @returns             ENOTCONN if no free identifier have been found.
  */
-static int icmp_bind_free_id(icmp_echo_ref echo_data)
+static int icmp_bind_free_id(icmp_echo_t *echo_data)
 {
         icmp_param_t index;
@@ -791 +791 @@
         struct sockaddr *addr;
         ipc_callid_t data_callid;
-        icmp_echo_ref echo_data;
+        icmp_echo_t *echo_data;
         int rc = EOK;
 
@@ -800 +800 @@
         answer_count = 0;
 
-        echo_data = (icmp_echo_ref) malloc(sizeof(*echo_data));
+        echo_data = (icmp_echo_t *) malloc(sizeof(*echo_data));
         if (!echo_data)
                 return ENOMEM;