Changeset 1038a9c in mainline for uspace/srv/net/ethip

Timestamp:

2012-06-01T19:12:06Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b16e77d

Parents:

a47f522

Message:

cstyle (no change in functionality)

Location:

uspace/srv/net/ethip

Files:

• ethip.c (modified) (1 diff)
• ethip_nic.c (modified) (4 diffs)

uspace/srv/net/ethip/ethip.c

@@ -73 +73 @@
 static int ethip_init(void)
 {
-        int rc;
-
         async_set_client_connection(ethip_client_conn);
-
-        rc = loc_server_register(NAME);
+        
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering server.");
                 return rc;
         }
-
+        
         rc = ethip_nic_discovery_start();
         if (rc != EOK)
                 return rc;
-
+        
         return EOK;
 }

uspace/srv/net/ethip/ethip_nic.c

@@ -150 +150 @@
 static int ethip_nic_open(service_id_t sid)
 {
-        ethip_nic_t *nic;
-        int rc;
         bool in_list = false;
         nic_address_t nic_address;
-
+        
         log_msg(LVL_DEBUG, "ethip_nic_open()");
-        nic = ethip_nic_new();
+        ethip_nic_t *nic = ethip_nic_new();
         if (nic == NULL)
                 return ENOMEM;
-
-        rc = loc_service_get_name(sid, &nic->svc_name);
+        
+        int rc = loc_service_get_name(sid, &nic->svc_name);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed getting service name.");
                 goto error;
         }
-
+        
         nic->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
         if (nic->sess == NULL) {
@@ -171 +169 @@
                 goto error;
         }
-
+        
         nic->svc_id = sid;
-
+        
         rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic);
         if (rc != EOK) {
@@ -298 +296 @@
 int ethip_nic_discovery_start(void)
 {
-        int rc;
-
-        rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
+        int rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering callback for NIC "
@@ -306 +302 @@
                 return rc;
         }
-
+        
         return ethip_nic_check_new();
 }