Changeset 257feec in mainline for uspace/srv/net/udp/sock.c

Timestamp:

2013-06-27T12:48:32Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9f391e9

Parents:

679ee84

Message:

cstyle (no change in functionality)

File:

• uspace/srv/net/udp/sock.c (modified) (8 diffs)

uspace/srv/net/udp/sock.c

@@ -222 +222 @@
                 assert(false);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - success");
         async_answer_0(callid, rc);
@@ -428 +428 @@
         socket = (udp_sockdata_t *)sock_core->specific_data;
         fibril_mutex_lock(&socket->lock);
-
+        
         if (socket->assoc == NULL) {
                 fibril_mutex_unlock(&socket->lock);
@@ -444 +444 @@
                     &socket->recv_buffer_lock);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Got data in sock recv_buffer");
 
@@ -467 +467 @@
                 assert(false);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "**** udp_uc_receive -> %d", rc);
+        
         if (rc != EOK) {
                 fibril_mutex_unlock(&socket->recv_buffer_lock);
@@ -519 +520 @@
                 return;
         }
-
+        
         if (length > data_len)
                 length = data_len;
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "data read finalize");
         rc = async_data_read_finalize(rcallid, socket->recv_buffer, length);
@@ -528 +529 @@
         if (length < data_len && rc == EOK)
                 rc = EOVERFLOW;
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "read_data_length <- %zu", length);
         IPC_SET_ARG2(answer, 0);
@@ -535 +536 @@
         async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
             IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
-
+        
         socket->recv_buffer_used = 0;
-
+        
         fibril_condvar_broadcast(&socket->recv_buffer_cv);
         fibril_mutex_unlock(&socket->recv_buffer_lock);
@@ -612 +613 @@
         while (true) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] wait for rcv buffer empty()");
-                while (sock->recv_buffer_used != 0 && sock->sock_core != NULL) {
+                while ((sock->recv_buffer_used != 0) && (sock->sock_core != NULL)) {
                         fibril_condvar_wait(&sock->recv_buffer_cv,
                             &sock->recv_buffer_lock);