Index: uspace/srv/net/ethip/ethip.c
===================================================================
--- uspace/srv/net/ethip/ethip.c	(revision bf9e6fca42015e5e14c445e502030671d36612e0)
+++ uspace/srv/net/ethip/ethip.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -73,18 +73,16 @@
 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;
 }
Index: uspace/srv/net/ethip/ethip_nic.c
===================================================================
--- uspace/srv/net/ethip/ethip_nic.c	(revision bf9e6fca42015e5e14c445e502030671d36612e0)
+++ uspace/srv/net/ethip/ethip_nic.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -150,20 +150,18 @@
 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,7 +169,7 @@
 		goto error;
 	}
-
+	
 	nic->svc_id = sid;
-
+	
 	rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic);
 	if (rc != EOK) {
@@ -298,7 +296,5 @@
 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,5 +302,5 @@
 		return rc;
 	}
-
+	
 	return ethip_nic_check_new();
 }
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision bf9e6fca42015e5e14c445e502030671d36612e0)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -66,17 +66,15 @@
 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,5 +83,5 @@
 		return EEXIST;
 	}
-
+	
 	rc = loc_service_register_with_iface(SERVICE_NAME_INETCFG, &sid,
 	    INET_PORT_CFG);
@@ -92,5 +90,5 @@
 		return EEXIST;
 	}
-
+	
 	rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid,
 	    INET_PORT_PING);
@@ -99,9 +97,9 @@
 		return EEXIST;
 	}
-
+	
 	rc = inet_link_discovery_start();
 	if (rc != EOK)
 		return EEXIST;
-
+	
 	return EOK;
 }
Index: uspace/srv/net/loopip/loopip.c
===================================================================
--- uspace/srv/net/loopip/loopip.c	(revision bf9e6fca42015e5e14c445e502030671d36612e0)
+++ uspace/srv/net/loopip/loopip.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -91,7 +91,7 @@
 	category_id_t iplink_cat;
 	const char *svc_name = "net/loopback";
-
+	
 	async_set_client_connection(loopip_client_conn);
-
+	
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/net/tcp/sock.c
===================================================================
--- uspace/srv/net/tcp/sock.c	(revision bf9e6fca42015e5e14c445e502030671d36612e0)
+++ uspace/srv/net/tcp/sock.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -68,14 +68,12 @@
 int tcp_sock_init(void)
 {
-	int rc;
-
 	socket_ports_initialize(&gsock);
-
+	
 	async_set_client_connection(tcp_sock_connection);
-
-	rc = service_register(SERVICE_TCP);
+	
+	int rc = service_register(SERVICE_TCP);
 	if (rc != EOK)
 		return EEXIST;
-
+	
 	return EOK;
 }
Index: uspace/srv/net/udp/sock.c
===================================================================
--- uspace/srv/net/udp/sock.c	(revision bf9e6fca42015e5e14c445e502030671d36612e0)
+++ uspace/srv/net/udp/sock.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -66,14 +66,12 @@
 int udp_sock_init(void)
 {
-	int rc;
-
 	socket_ports_initialize(&gsock);
-
+	
 	async_set_client_connection(udp_sock_connection);
-
-	rc = service_register(SERVICE_UDP);
+	
+	int rc = service_register(SERVICE_UDP);
 	if (rc != EOK)
 		return EEXIST;
-
+	
 	return EOK;
 }