Changeset a7811f17 in mainline for uspace/lib/net/il

Timestamp:

2010-11-19T21:28:02Z (15 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.

Location:

uspace/lib/net/il

Files:

• arp_remote.c (modified) (3 diffs)
• ip_client.c (modified) (8 diffs)
• ip_remote.c (modified) (1 diff)

uspace/lib/net/il/arp_remote.c

@@ -83 +83 @@
 int
 arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address)
+    measured_string_t *address)
 {
         aid_t message_id;
@@ -133 +133 @@
  */
 int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol,
-    services_t netif, measured_string_ref address)
+    services_t netif, measured_string_t *address)
 {
         aid_t message_id;
@@ -165 +165 @@
 int
 arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address, measured_string_ref *translation, char **data)
+    measured_string_t *address, measured_string_t **translation, char **data)
 {
         return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,

uspace/lib/net/il/ip_client.c

@@ -53 +53 @@
 size_t ip_client_header_length(packet_t packet)
 {
-        ip_header_ref header;
-
-        header = (ip_header_ref) packet_get_data(packet);
+        ip_header_t *header;
+
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return 0;
@@ -91 +91 @@
     size_t data_length, void **header, size_t *headerlen)
 {
-        ipv4_pseudo_header_ref header_in;
+        ipv4_pseudo_header_t *header_in;
         struct sockaddr_in *address_in;
 
@@ -109 +109 @@
                 
                 *headerlen = sizeof(*header_in);
-                header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+                header_in = (ipv4_pseudo_header_t *) malloc(*headerlen);
                 if (!header_in)
                         return ENOMEM;
@@ -155 +155 @@
     ip_tos_t tos, int dont_fragment, size_t ipopt_length)
 {
-        ip_header_ref header;
+        ip_header_t *header;
         uint8_t *data;
         size_t padding;
@@ -177 +177 @@
 
         // set the header
-        header = (ip_header_ref) data;
+        header = (ip_header_t *) data;
         header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
             ipopt_length);
@@ -211 +211 @@
     ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length)
 {
-        ip_header_ref header;
-
-        header = (ip_header_ref) packet_get_data(packet);
+        ip_header_t *header;
+
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return ENOMEM;
@@ -247 +247 @@
     size_t data_length)
 {
-        ipv4_pseudo_header_ref header_in;
+        ipv4_pseudo_header_t *header_in;
 
         if (!header)
@@ -253 +253 @@
 
         if (headerlen == sizeof(ipv4_pseudo_header_t)) {
-                header_in = (ipv4_pseudo_header_ref) header;
+                header_in = (ipv4_pseudo_header_t *) header;
                 header_in->data_length = htons(data_length);
                 return EOK;

uspace/lib/net/il/ip_remote.c

@@ -186 +186 @@
  */
 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
         return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,