Changes in uspace/srv/net/modules.c [a64c64d:aadf01e] in mainline

File:

• uspace/srv/net/modules.c (modified) (5 diffs)

uspace/srv/net/modules.c

@@ -51 +51 @@
 
 void answer_call(ipc_callid_t callid, int result, ipc_call_t * answer, int answer_count){
-        // choose the most efficient answer function
         if(answer || (! answer_count)){
                 switch(answer_count){
@@ -87 +86 @@
         ipcarg_t phonehash;
 
-        // connect to the needed service
         phone = connect_to_service_timeout(need, timeout);
-        // if connected
         if(phone >= 0){
-                // request the bidirectional connection
                 if(ERROR_OCCURRED(ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash))){
                         ipc_hangup(phone);
@@ -106 +102 @@
 
 int connect_to_service_timeout(services_t need, suseconds_t timeout){
-        int phone;
+        if (timeout <= 0)
+                return async_connect_me_to_blocking(PHONE_NS, need, 0, 0);
+        
+        while(true){
+                int phone;
 
-        // if no timeout is set
-        if (timeout <= 0){
-                return async_connect_me_to_blocking(PHONE_NS, need, 0, 0);
-        }
-
-        while(true){
                 phone = async_connect_me_to(PHONE_NS, need, 0, 0);
-                if((phone >= 0) || (phone != ENOENT)){
+                if((phone >= 0) || (phone != ENOENT))
                         return phone;
-                }
-
-                // end if no time is left
+        
+                timeout -= MODULE_WAIT_TIME;
                 if(timeout <= 0){
                         return ETIMEOUT;
                 }
 
-                // wait the minimum of the module wait time and the timeout
-                usleep((timeout <= MODULE_WAIT_TIME) ? timeout : MODULE_WAIT_TIME);
-                timeout -= MODULE_WAIT_TIME;
+                usleep(MODULE_WAIT_TIME);
         }
 }
@@ -138 +129 @@
                 return EBADMEM;
         }
-
-        // fetch the request
         if(! async_data_write_receive(&callid, length)){
                 return EINVAL;
         }
-
-        // allocate the buffer
         *data = malloc(*length);
         if(!(*data)){
                 return ENOMEM;
         }
-
-        // fetch the data
         if(ERROR_OCCURRED(async_data_write_finalize(callid, * data, * length))){
                 free(data);
@@ -162 +147 @@
         ipc_callid_t callid;
 
-        // fetch the request
         if(! async_data_read_receive(&callid, &length)){
                 return EINVAL;
         }
-
-        // check the requested data size
         if(length < data_length){
                 async_data_read_finalize(callid, data, length);
                 return EOVERFLOW;
         }
-
-        // send the data
         return async_data_read_finalize(callid, data, data_length);
 }
 
 void refresh_answer(ipc_call_t * answer, int * answer_count){
-
         if(answer_count){
                 *answer_count = 0;
         }
-
         if(answer){
                 IPC_SET_RETVAL(*answer, 0);