Changeset b5cf742a in mainline for uspace/lib/c

Timestamp:

2013-06-28T16:22:42Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

edf0d27

Parents:

e52b4b5

Message:

cstyle (no change in functionality)

Location:

uspace/lib/c/generic

Files:

• inet.c (modified) (3 diffs)
• inetcfg.c (modified) (5 diffs)
• iplink.c (modified) (2 diffs)
• iplink_srv.c (modified) (9 diffs)

uspace/lib/c/generic/inet.c

@@ -169 +169 @@
         inet_addr_unpack(IPC_GET_ARG2(*call), &dgram.dest);
         dgram.tos = IPC_GET_ARG3(*call);
-
+        
         rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
         if (rc != EOK) {
@@ -175 +175 @@
                 return;
         }
-
+        
         rc = inet_ev_ops->recv(&dgram);
         async_answer_0(callid, rc);
@@ -185 +185 @@
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-
+                
                 if (!IPC_GET_IMETHOD(call)) {
                         /* TODO: Handle hangup */
                         return;
                 }
-
+                
                 switch (IPC_GET_IMETHOD(call)) {
                 case INET_EV_RECV:

uspace/lib/c/generic/inetcfg.c

@@ -159 +159 @@
         *addr_id = IPC_GET_ARG1(answer);
         
-        return retval;
+        return (int) retval;
 }
 
@@ -178 +178 @@
         size_t act_size;
         char name_buf[LOC_NAME_MAXLEN + 1];
-
-        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
-
+        
+        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
+        
         ipc_call_t answer;
         aid_t req = async_send_1(exch, INETCFG_ADDR_GET, addr_id, &answer);
         aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
         async_wait_for(dreq, &dretval);
-
-        async_exchange_end(exch);
-
+        
+        async_exchange_end(exch);
+        
         if (dretval != EOK) {
                 async_forget(req);
                 return dretval;
         }
-
+        
         sysarg_t retval;
         async_wait_for(req, &retval);
-
+        
         if (retval != EOK)
-                return retval;
-
+                return (int) retval;
+        
         act_size = IPC_GET_ARG2(dreply);
         assert(act_size <= LOC_NAME_MAXLEN);
+        
         name_buf[act_size] = '\0';
         
@@ -207 +208 @@
         ainfo->ilink = IPC_GET_ARG3(answer);
         ainfo->name = str_dup(name_buf);
-
+        
         return EOK;
 }
@@ -340 +341 @@
 
         async_exch_t *exch = async_exchange_begin(inetcfg_sess);
-
+        
         ipc_call_t answer;
         aid_t req = async_send_1(exch, INETCFG_SROUTE_GET, sroute_id, &answer);
         aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
         async_wait_for(dreq, &dretval);
-
-        async_exchange_end(exch);
-
+        
+        async_exchange_end(exch);
+        
         if (dretval != EOK) {
                 async_forget(req);
                 return dretval;
         }
-
+        
         sysarg_t retval;
         async_wait_for(req, &retval);
-
+        
         if (retval != EOK)
-                return retval;
-
+                return (int) retval;
+        
         act_size = IPC_GET_ARG2(dreply);
         assert(act_size <= LOC_NAME_MAXLEN);
@@ -367 +368 @@
         inet_addr_unpack(IPC_GET_ARG3(answer), &srinfo->router);
         srinfo->name = str_dup(name_buf);
-
+        
         return EOK;
 }

uspace/lib/c/generic/iplink.c

@@ -99 +99 @@
         sysarg_t retval;
         async_wait_for(req, &retval);
-        if (retval != EOK)
-                return retval;
         
-        return EOK;
+        return (int) retval;
 }
 
@@ -169 +167 @@
 static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        iplink_t *iplink = (iplink_t *)arg;
-
+        iplink_t *iplink = (iplink_t *) arg;
+        
         while (true) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-
+                
                 if (!IPC_GET_IMETHOD(call)) {
                         /* TODO: Handle hangup */
                         return;
                 }
-
+                
                 switch (IPC_GET_IMETHOD(call)) {
                 case IPLINK_EV_RECV:

uspace/lib/c/generic/iplink_srv.c

@@ -44 +44 @@
     ipc_call_t *call)
 {
-        int rc;
         size_t mtu;
-
-        rc = srv->ops->get_mtu(srv, &mtu);
+        int rc = srv->ops->get_mtu(srv, &mtu);
         async_answer_1(callid, rc, mtu);
 }
@@ -70 +68 @@
         iplink_srv_sdu_t sdu;
         int rc;
-
+        
         sdu.lsrc = IPC_GET_ARG1(*call);
         sdu.ldest = IPC_GET_ARG2(*call);
-
+        
         rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
         if (rc != EOK) {
@@ -79 +77 @@
                 return;
         }
-
+        
         rc = srv->ops->send(srv, &sdu);
         free(sdu.data);
@@ -98 +96 @@
         iplink_srv_t *srv = (iplink_srv_t *)arg;
         int rc;
-
+        
         fibril_mutex_lock(&srv->lock);
         if (srv->connected) {
@@ -105 +103 @@
                 return EBUSY;
         }
-
+        
         srv->connected = true;
         fibril_mutex_unlock(&srv->lock);
-
+        
         /* Accept the connection */
         async_answer_0(iid, EOK);
-
+        
         async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
         if (sess == NULL)
                 return ENOMEM;
-
+        
         srv->client_sess = sess;
-
+        
         rc = srv->ops->open(srv);
         if (rc != EOK)
                 return rc;
-
+        
         while (true) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
-
+                
                 if (!method) {
                         /* The other side has hung up */
@@ -135 +133 @@
                         break;
                 }
-
+                
                 switch (method) {
                 case IPLINK_GET_MTU:
@@ -153 +151 @@
                 }
         }
-
+        
         return srv->ops->close(srv);
 }
@@ -161 +159 @@
         if (srv->client_sess == NULL)
                 return EIO;
-
+        
         async_exch_t *exch = async_exchange_begin(srv->client_sess);
-
+        
         ipc_call_t answer;
         aid_t req = async_send_2(exch, IPLINK_EV_RECV, (sysarg_t) sdu->lsrc,
@@ -169 +167 @@
         int rc = async_data_write_start(exch, sdu->data, sdu->size);
         async_exchange_end(exch);
-
+        
         if (rc != EOK) {
                 async_forget(req);
                 return rc;
         }
-
+        
         sysarg_t retval;
         async_wait_for(req, &retval);
         if (retval != EOK)
                 return retval;
-
+        
         return EOK;
 }