Changeset b4ca0a9c in mainline for uspace/lib/c/generic/inet.c

Timestamp:

2012-07-10T11:53:50Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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/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);
-        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 +76 @@
         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 +92 @@
                 return EIO;
         }
-
+        
         if (inet_callback_create() != EOK) {
                 async_hangup(inet_sess);
@@ -102 +98 @@
                 return EIO;
         }
-
+        
         inet_protocol = protocol;
         inet_ev_ops = ev_ops;