Changeset 57dea62 in mainline

Timestamp:

2015-08-22T03:58:28Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

566992e1

Parents:

9cfbf2f

Message:

coding style (no change in functionality)

File:

• uspace/lib/c/generic/async.c (modified) (17 diffs)

uspace/lib/c/generic/async.c

@@ -189 +189 @@
         /** If reply was received. */
         bool done;
-
+        
         /** If the message / reply should be discarded on arrival. */
         bool forget;
-
+        
         /** If already destroyed. */
         bool destroyed;
@@ -266 +266 @@
 {
         struct timeval tv = { 0, 0 };
-
+        
         to->inlist = false;
         to->occurred = false;
@@ -289 +289 @@
 static amsg_t *amsg_create(void)
 {
-        amsg_t *msg;
-
-        msg = malloc(sizeof(amsg_t));
+        amsg_t *msg = malloc(sizeof(amsg_t));
         if (msg) {
                 msg->done = false;
@@ -300 +298 @@
                 awaiter_initialize(&msg->wdata);
         }
-
+        
         return msg;
 }
@@ -869 +867 @@
         }
         
-        msg_t *msg = list_get_instance(list_first(&conn->msg_queue), msg_t, link);
+        msg_t *msg = list_get_instance(list_first(&conn->msg_queue),
+            msg_t, link);
         list_remove(&msg->link);
         
@@ -937 +936 @@
         if (!client)
                 return NULL;
+        
         if (!client->data) {
                 async_client_put(client);
                 return NULL;
         }
-
+        
         return client->data;
 }
@@ -948 +948 @@
 {
         client_t *client = async_client_get(client_id, false);
-
+        
         assert(client);
         assert(client->data);
-
+        
         /* Drop the reference we got in async_get_client_data_by_hash(). */
         async_client_put(client);
-
+        
         /* Drop our own reference we got at the beginning of this function. */
         async_client_put(client);
@@ -1346 +1346 @@
         
         msg->done = true;
-
+        
         if (msg->forget) {
                 assert(msg->wdata.active);
@@ -1354 +1354 @@
                 fibril_add_ready(msg->wdata.fid);
         }
-
+        
         futex_up(&async_futex);
 }
@@ -1446 +1446 @@
         
         futex_down(&async_futex);
-
+        
         assert(!msg->forget);
         assert(!msg->destroyed);
-
+        
         if (msg->done) {
                 futex_up(&async_futex);
@@ -1490 +1490 @@
         
         amsg_t *msg = (amsg_t *) amsgid;
-
+        
         futex_down(&async_futex);
-
+        
         assert(!msg->forget);
         assert(!msg->destroyed);
-
+        
         if (msg->done) {
                 futex_up(&async_futex);
@@ -1507 +1507 @@
         if (timeout < 0)
                 timeout = 0;
-
+        
         getuptime(&msg->wdata.to_event.expires);
         tv_add_diff(&msg->wdata.to_event.expires, timeout);
@@ -1560 +1560 @@
 {
         amsg_t *msg = (amsg_t *) amsgid;
-
+        
         assert(msg);
         assert(!msg->forget);
         assert(!msg->destroyed);
-
+        
         futex_down(&async_futex);
+        
         if (msg->done) {
                 amsg_destroy(msg);
@@ -1572 +1573 @@
                 msg->forget = true;
         }
+        
         futex_up(&async_futex);
 }
@@ -2697 +2699 @@
         }
         
-        void *_data;
+        void *arg_data;
         
         if (nullterm)
-                _data = malloc(size + 1);
+                arg_data = malloc(size + 1);
         else
-                _data = malloc(size);
-        
-        if (_data == NULL) {
+                arg_data = malloc(size);
+        
+        if (arg_data == NULL) {
                 ipc_answer_0(callid, ENOMEM);
                 return ENOMEM;
         }
         
-        int rc = async_data_write_finalize(callid, _data, size);
+        int rc = async_data_write_finalize(callid, arg_data, size);
         if (rc != EOK) {
-                free(_data);
+                free(arg_data);
                 return rc;
         }
         
         if (nullterm)
-                ((char *) _data)[size] = 0;
-        
-        *data = _data;
+                ((char *) arg_data)[size] = 0;
+        
+        *data = arg_data;
         if (received != NULL)
                 *received = size;
@@ -2937 +2939 @@
 {
         assert(callid);
-
+        
         ipc_call_t call;
         *callid = async_get_call(&call);
-
+        
         if (IPC_GET_IMETHOD(call) != IPC_M_STATE_CHANGE_AUTHORIZE)
                 return false;
@@ -2950 +2952 @@
         if (arg3)
                 *arg3 = IPC_GET_ARG3(call);
-
+        
         return true;
 }