Changeset 65f991e in mainline

Timestamp:

2013-07-25T12:32:44Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b323a3a

Parents:

c442f63

Message:

cstyle: name the link member of a linked structure "link"
(not the same as the list it gets inserted to, which is rather confusing)

Location:

uspace/srv/net/ethip

Files:

• ethip.h (modified) (2 diffs)
• ethip_nic.c (modified) (9 diffs)

uspace/srv/net/ethip/ethip.h

@@ -46 +46 @@
 
 typedef struct {
-        link_t addr_list;
+        link_t link;
         inet_addr_t addr;
 } ethip_link_addr_t;
 
 typedef struct ethip_nic {
-        link_t nic_list;
+        link_t link;
         service_id_t svc_id;
         char *svc_name;
@@ -61 +61 @@
         /** MAC address */
         addr48_t mac_addr;
-        /** List of IP addresses configured on this link */
-        list_t addr_list; /* of ethip_link_addr_t */
+        
+        /**
+         * List of IP addresses configured on this link
+         * (of the type ethip_link_addr_t)
+         */
+        list_t addr_list;
 } ethip_nic_t;
 

uspace/srv/net/ethip/ethip_nic.c

@@ -83 +83 @@
                 already_known = false;
 
-                list_foreach(ethip_nic_list, nic_link) {
-                        ethip_nic_t *nic = list_get_instance(nic_link,
-                            ethip_nic_t, nic_list);
+                list_foreach(ethip_nic_list, link) {
+                        ethip_nic_t *nic = list_get_instance(link,
+                            ethip_nic_t, link);
                         if (nic->svc_id == svcs[i]) {
                                 already_known = true;
@@ -115 +115 @@
         }
 
-        link_initialize(&nic->nic_list);
+        link_initialize(&nic->link);
         list_initialize(&nic->addr_list);
 
@@ -130 +130 @@
         }
         
-        link_initialize(&laddr->addr_list);
+        link_initialize(&laddr->link);
         laddr->addr = *addr;
         
@@ -180 +180 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened NIC '%s'", nic->svc_name);
-        list_append(&nic->nic_list, &ethip_nic_list);
+        list_append(&nic->link, &ethip_nic_list);
         in_list = true;
 
@@ -209 +209 @@
 error:
         if (in_list)
-                list_remove(&nic->nic_list);
+                list_remove(&nic->link);
+        
         if (nic->sess != NULL)
                 async_hangup(nic->sess);
+        
         ethip_nic_delete(nic);
         return rc;
@@ -312 +314 @@
         list_foreach(ethip_nic_list, link) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element");
-                ethip_nic_t *nic = list_get_instance(link, ethip_nic_t,
-                    nic_list);
+                ethip_nic_t *nic = list_get_instance(link, ethip_nic_t, link);
 
                 if (nic->iplink_sid == iplink_sid) {
@@ -342 +343 @@
                 return ENOMEM;
         
-        list_append(&laddr->addr_list, &nic->addr_list);
+        list_append(&laddr->link, &nic->addr_list);
         return EOK;
 }
@@ -354 +355 @@
                 return ENOENT;
         
-        list_remove(&laddr->addr_list);
+        list_remove(&laddr->link);
         ethip_link_addr_delete(laddr);
         return EOK;
@@ -366 +367 @@
         list_foreach(nic->addr_list, link) {
                 ethip_link_addr_t *laddr = list_get_instance(link,
-                    ethip_link_addr_t, addr_list);
+                    ethip_link_addr_t, link);
                 
                 if (inet_addr_compare(addr, &laddr->addr))