Changeset a35b458 in mainline for uspace/srv/net/ethip/ethip_nic.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/srv/net/ethip/ethip_nic.c (modified) (17 diffs)

uspace/srv/net/ethip/ethip_nic.c

@@ -112 +112 @@
                 return NULL;
         }
-        
+
         link_initialize(&nic->link);
         list_initialize(&nic->addr_list);
-        
+
         return nic;
 }
@@ -127 +127 @@
                 return NULL;
         }
-        
+
         link_initialize(&laddr->link);
         laddr->addr = *addr;
-        
+
         return laddr;
 }
@@ -138 +138 @@
         if (nic->svc_name != NULL)
                 free(nic->svc_name);
-        
+
         free(nic);
 }
@@ -151 +151 @@
         bool in_list = false;
         nic_address_t nic_address;
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_open()");
         ethip_nic_t *nic = ethip_nic_new();
         if (nic == NULL)
                 return ENOMEM;
-        
+
         errno_t rc = loc_service_get_name(sid, &nic->svc_name);
         if (rc != EOK) {
@@ -162 +162 @@
                 goto error;
         }
-        
+
         nic->sess = loc_service_connect(sid, INTERFACE_DDF, 0);
         if (nic->sess == NULL) {
@@ -168 +168 @@
                 goto error;
         }
-        
+
         nic->svc_id = sid;
-        
+
         rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic);
         if (rc != EOK) {
@@ -192 +192 @@
                 goto error;
         }
-        
+
         addr48(nic_address.address, nic->mac_addr);
 
@@ -216 +216 @@
         if (in_list)
                 list_remove(&nic->link);
-        
+
         if (nic->sess != NULL)
                 async_hangup(nic->sess);
-        
+
         ethip_nic_delete(nic);
         return rc;
@@ -332 +332 @@
                 return rc;
         }
-        
+
         return ethip_nic_check_new();
 }
@@ -371 +371 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_setup_multicast()");
-        
+
         /* Count the number of multicast addresses */
-        
+
         size_t count = 0;
-        
+
         list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
                 ip_ver_t ver = inet_addr_get(&laddr->addr, NULL, NULL);
@@ -381 +381 @@
                         count++;
         }
-        
+
         if (count == 0)
                 return nic_multicast_set_mode(nic->sess, NIC_MULTICAST_BLOCKED,
                     NULL, 0);
-        
+
         nic_address_t *mac_list = calloc(count, sizeof(nic_address_t));
         if (mac_list == NULL)
                 return ENOMEM;
-        
+
         /* Create the multicast MAC list */
-        
+
         size_t i = 0;
-        
+
         list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
                 addr128_t v6;
@@ -399 +399 @@
                 if (ver != ip_v6)
                         continue;
-                
+
                 assert(i < count);
-                
+
                 addr48_t mac;
                 addr48_solicited_node(v6, mac);
-                
+
                 /* Avoid duplicate addresses in the list */
-                
+
                 bool found = false;
-                
+
                 for (size_t j = 0; j < i; j++) {
                         if (addr48_compare(mac_list[j].address, mac)) {
@@ -415 +415 @@
                         }
                 }
-                
+
                 if (!found) {
                         addr48(mac, mac_list[i].address);
@@ -422 +422 @@
                         count--;
         }
-        
+
         /* Setup the multicast MAC list */
-        
+
         errno_t rc = nic_multicast_set_mode(nic->sess, NIC_MULTICAST_LIST,
             mac_list, count);
-        
+
         free(mac_list);
         return rc;
@@ -435 +435 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()");
-        
+
         ethip_link_addr_t *laddr = ethip_nic_addr_new(addr);
         if (laddr == NULL)
                 return ENOMEM;
-        
+
         list_append(&laddr->link, &nic->addr_list);
-        
+
         return ethip_nic_setup_multicast(nic);
 }
@@ -448 +448 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()");
-        
+
         ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, addr);
         if (laddr == NULL)
                 return ENOENT;
-        
+
         list_remove(&laddr->link);
         ethip_link_addr_delete(laddr);
-        
+
         return ethip_nic_setup_multicast(nic);
 }
@@ -463 +463 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()");
-        
+
         list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) {
                 if (inet_addr_compare(addr, &laddr->addr))
                         return laddr;
         }
-        
+
         return NULL;
 }