Index: uspace/lib/c/generic/inet.c
===================================================================
--- uspace/lib/c/generic/inet.c	(revision 1a23f6ec4a86a9f9b2d79272d9b134a9e00875f8)
+++ uspace/lib/c/generic/inet.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -44,29 +44,25 @@
 {
 	async_exch_t *exch = async_exchange_begin(inet_sess);
-
+	
 	ipc_call_t answer;
 	aid_t req = async_send_0(exch, INET_CALLBACK_CREATE, &answer);
 	int rc = async_connect_to_me(exch, 0, 0, 0, inet_cb_conn, NULL);
 	async_exchange_end(exch);
-
+	
 	if (rc != EOK)
 		return rc;
-
+	
 	sysarg_t retval;
 	async_wait_for(req, &retval);
-	if (retval != EOK)
-		return retval;
-
-	return EOK;
+	
+	return retval;
 }
 
 static int inet_set_proto(uint8_t protocol)
 {
-	int rc;
-
 	async_exch_t *exch = async_exchange_begin(inet_sess);
-	rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
+	int rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
 	async_exchange_end(exch);
-
+	
 	return rc;
 }
@@ -80,15 +76,15 @@
 	assert(inet_ev_ops == NULL);
 	assert(inet_protocol == 0);
-
+	
 	rc = loc_service_get_id(SERVICE_NAME_INET, &inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (rc != EOK)
 		return ENOENT;
-
+	
 	inet_sess = loc_service_connect(EXCHANGE_SERIALIZE, inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (inet_sess == NULL)
 		return ENOENT;
-
+	
 	if (inet_set_proto(protocol) != EOK) {
 		async_hangup(inet_sess);
@@ -96,5 +92,5 @@
 		return EIO;
 	}
-
+	
 	if (inet_callback_create() != EOK) {
 		async_hangup(inet_sess);
@@ -102,5 +98,5 @@
 		return EIO;
 	}
-
+	
 	inet_protocol = protocol;
 	inet_ev_ops = ev_ops;
Index: uspace/lib/c/generic/inetcfg.c
===================================================================
--- uspace/lib/c/generic/inetcfg.c	(revision 1a23f6ec4a86a9f9b2d79272d9b134a9e00875f8)
+++ uspace/lib/c/generic/inetcfg.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -119,15 +119,15 @@
 
 	assert(inetcfg_sess == NULL);
-
+	
 	rc = loc_service_get_id(SERVICE_NAME_INETCFG, &inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (rc != EOK)
 		return ENOENT;
-
+	
 	inetcfg_sess = loc_service_connect(EXCHANGE_SERIALIZE, inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (inetcfg_sess == NULL)
 		return ENOENT;
-
+	
 	return EOK;
 }
Index: uspace/lib/c/generic/inetping.c
===================================================================
--- uspace/lib/c/generic/inetping.c	(revision 1a23f6ec4a86a9f9b2d79272d9b134a9e00875f8)
+++ uspace/lib/c/generic/inetping.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -49,22 +49,22 @@
 
 	assert(inetping_sess == NULL);
-
+	
 	inetping_ev_ops = ev_ops;
-
+	
 	rc = loc_service_get_id(SERVICE_NAME_INETPING, &inetping_svc,
 	    IPC_FLAG_BLOCKING);
 	if (rc != EOK)
 		return ENOENT;
-
+	
 	inetping_sess = loc_service_connect(EXCHANGE_SERIALIZE, inetping_svc,
 	    IPC_FLAG_BLOCKING);
 	if (inetping_sess == NULL)
 		return ENOENT;
-
+	
 	async_exch_t *exch = async_exchange_begin(inetping_sess);
 
 	rc = async_connect_to_me(exch, 0, 0, 0, inetping_cb_conn, NULL);
 	async_exchange_end(exch);
-
+	
 	if (rc != EOK) {
 		async_hangup(inetping_sess);
@@ -72,5 +72,5 @@
 		return rc;
 	}
-
+	
 	return EOK;
 }
Index: uspace/lib/c/generic/iplink.c
===================================================================
--- uspace/lib/c/generic/iplink.c	(revision 1a23f6ec4a86a9f9b2d79272d9b134a9e00875f8)
+++ uspace/lib/c/generic/iplink.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -49,29 +49,26 @@
     iplink_t **riplink)
 {
-	iplink_t *iplink = NULL;
-	int rc;
-
-	iplink = calloc(1, sizeof(iplink_t));
+	iplink_t *iplink = calloc(1, sizeof(iplink_t));
 	if (iplink == NULL)
 		return ENOMEM;
-
+	
 	iplink->sess = sess;
 	iplink->ev_ops = ev_ops;
-
+	
 	async_exch_t *exch = async_exchange_begin(sess);
-
-	rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
+	
+	int rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
 	async_exchange_end(exch);
-
+	
 	if (rc != EOK)
 		goto error;
-
+	
 	*riplink = iplink;
 	return EOK;
-
+	
 error:
 	if (iplink != NULL)
 		free(iplink);
-
+	
 	return rc;
 }
Index: uspace/lib/c/generic/net/socket_client.c
===================================================================
--- uspace/lib/c/generic/net/socket_client.c	(revision 1a23f6ec4a86a9f9b2d79272d9b134a9e00875f8)
+++ uspace/lib/c/generic/net/socket_client.c	(revision b39b5cb669ab0cebd3e1df1e46c056940a004088)
@@ -283,9 +283,8 @@
 static async_sess_t *socket_get_tcp_sess(void)
 {
-	if (socket_globals.tcp_sess == NULL) {
+	if (socket_globals.tcp_sess == NULL)
 		socket_globals.tcp_sess = service_bind(SERVICE_TCP,
 		    0, 0, SERVICE_TCP, socket_connection);
-	}
-
+	
 	return socket_globals.tcp_sess;
 }
@@ -300,9 +299,8 @@
 static async_sess_t *socket_get_udp_sess(void)
 {
-	if (socket_globals.udp_sess == NULL) {
+	if (socket_globals.udp_sess == NULL)
 		socket_globals.udp_sess = service_bind(SERVICE_UDP,
 		    0, 0, SERVICE_UDP, socket_connection);
-	}
-
+	
 	return socket_globals.udp_sess;
 }