Changes in uspace/lib/c/generic/inet.c [77ad86c:50b581d] in mainline

File:

• uspace/lib/c/generic/inet.c (modified) (4 diffs)

uspace/lib/c/generic/inet.c

@@ -44 +44 @@
 {
         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);
-        
-        return retval;
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
 }
 
 static int inet_set_proto(uint8_t protocol)
 {
+        int rc;
+
         async_exch_t *exch = async_exchange_begin(inet_sess);
-        int rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
+        rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
         async_exchange_end(exch);
-        
+
         return rc;
 }
@@ -76 +80 @@
         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);
@@ -92 +96 @@
                 return EIO;
         }
-        
+
         if (inet_callback_create() != EOK) {
                 async_hangup(inet_sess);
@@ -98 +102 @@
                 return EIO;
         }
-        
+
         inet_protocol = protocol;
         inet_ev_ops = ev_ops;