Changes in uspace/srv/net/ethip/ethip_nic.c [1038a9c:96c0b7b] in mainline

File:

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

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()");
-        ethip_nic_t *nic = ethip_nic_new();
+        nic = ethip_nic_new();
         if (nic == NULL)
                 return ENOMEM;
-        
-        int rc = loc_service_get_name(sid, &nic->svc_name);
+
+        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) {
@@ -169 +171 @@
                 goto error;
         }
-        
+
         nic->svc_id = sid;
-        
+
         rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic);
         if (rc != EOK) {
@@ -296 +298 @@
 int ethip_nic_discovery_start(void)
 {
-        int rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
+        int rc;
+
+        rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering callback for NIC "
@@ -302 +306 @@
                 return rc;
         }
-        
+
         return ethip_nic_check_new();
 }