Changeset e1e4192 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2012-06-03T20:45:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

90478727

Parents:

f7e69f5 (diff), 3123d2a (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 mainline changes

File:

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

uspace/srv/net/inetsrv/inetsrv.c

@@ -66 +66 @@
 static int inet_init(void)
 {
-        service_id_t sid;
-        int rc;
-
         log_msg(LVL_DEBUG, "inet_init()");
-
+        
         async_set_client_connection(inet_client_conn);
-
-        rc = loc_server_register(NAME);
+        
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering server (%d).", rc);
                 return EEXIST;
         }
-
+        
+        service_id_t sid;
         rc = loc_service_register_with_iface(SERVICE_NAME_INET, &sid,
             INET_PORT_DEFAULT);
@@ -85 +83 @@
                 return EEXIST;
         }
-
+        
         rc = loc_service_register_with_iface(SERVICE_NAME_INETCFG, &sid,
             INET_PORT_CFG);
@@ -92 +90 @@
                 return EEXIST;
         }
-
+        
         rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid,
             INET_PORT_PING);
@@ -99 +97 @@
                 return EEXIST;
         }
-
+        
         rc = inet_link_discovery_start();
         if (rc != EOK)
                 return EEXIST;
-
+        
         return EOK;
 }