Changeset 16ac756 in mainline

Timestamp:

2010-11-07T19:47:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88b127b, 9ce7eb5

Parents:

9fd39d6

Message:

Get rid of the ERROR_CODE madness in libc/net.

Location:

uspace/lib/c/generic/net

Files:

• modules.c (modified) (5 diffs)
• packet.c (modified) (4 diffs)
• socket_client.c (modified) (14 diffs)

uspace/lib/c/generic/net/modules.c

@@ -41 +41 @@
 #include <async.h>
 #include <malloc.h>
-#include <err.h>
+#include <errno.h>
 #include <sys/time.h>
 
@@ -137 +137 @@
     ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* Connect to the needed service */
@@ -144 +144 @@
                 /* Request the bidirectional connection */
                 ipcarg_t phonehash;
-                if (ERROR_OCCURRED(ipc_connect_to_me(phone, arg1, arg2, arg3,
-                    &phonehash))) {
+                
+                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
+                if (rc != EOK) {
                         ipc_hangup(phone);
-                        return ERROR_CODE;
+                        return rc;
                 }
                 async_new_connection(phonehash, 0, NULL, client_receiver);
@@ -212 +213 @@
 int data_receive(void **data, size_t *length)
 {
-        ERROR_DECLARE;
-
         ipc_callid_t callid;
+        int rc;
 
         if (!data || !length)
@@ -229 +229 @@
 
         // fetch the data
-        if (ERROR_OCCURRED(async_data_write_finalize(callid, *data, *length))) {
+        rc = async_data_write_finalize(callid, *data, *length);
+        if (rc != EOK) {
                 free(data);
-                return ERROR_CODE;
+                return rc;
         }
 

uspace/lib/c/generic/net/packet.c

@@ -41 +41 @@
 #include <unistd.h>
 #include <errno.h>
-#include <err.h>
 
 #include <sys/mman.h>
@@ -91 +90 @@
 int pm_init(void)
 {
-        ERROR_DECLARE;
+        int rc;
 
         fibril_rwlock_initialize(&pm_globals.lock);
+        
         fibril_rwlock_write_lock(&pm_globals.lock);
-        ERROR_PROPAGATE(gpm_initialize(&pm_globals.packet_map));
+        rc = gpm_initialize(&pm_globals.packet_map);
         fibril_rwlock_write_unlock(&pm_globals.lock);
-        return EOK;
+        
+        return rc;
 }
 
@@ -139 +140 @@
 int pm_add(packet_t packet)
 {
-        ERROR_DECLARE;
-
         packet_map_ref map;
+        int rc;
 
         if (!packet_is_valid(packet))
@@ -160 +160 @@
                         }
                         bzero(map, sizeof(packet_map_t));
-                        if ((ERROR_CODE =
-                            gpm_add(&pm_globals.packet_map, map)) < 0) {
+                        rc = gpm_add(&pm_globals.packet_map, map);
+                        if (rc < 0) {
                                 fibril_rwlock_write_unlock(&pm_globals.lock);
                                 free(map);
-                                return ERROR_CODE;
+                                return rc;
                         }
                 } while (PACKET_MAP_PAGE(packet->packet_id) >=

uspace/lib/c/generic/net/socket_client.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <errno.h>
-#include <err.h>
 
 #include <ipc/services.h>
@@ -212 +211 @@
 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall)
 {
-        ERROR_DECLARE;
-
         ipc_callid_t callid;
         ipc_call_t call;
         socket_ref socket;
+        int rc;
 
 loop:
@@ -231 +229 @@
                     SOCKET_GET_SOCKET_ID(call));
                 if (!socket) {
-                        ERROR_CODE = ENOTSOCK;
+                        rc = ENOTSOCK;
                         fibril_rwlock_read_unlock(&socket_globals.lock);
                         break;
@@ -240 +238 @@
                         fibril_mutex_lock(&socket->receive_lock);
                         // push the number of received packet fragments
-                        if (!ERROR_OCCURRED(dyn_fifo_push(&socket->received,
+                        rc = dyn_fifo_push(&socket->received,
                             SOCKET_GET_DATA_FRAGMENTS(call),
-                            SOCKET_MAX_RECEIVED_SIZE))) {
+                            SOCKET_MAX_RECEIVED_SIZE);
+                        if (rc == EOK) {
                                 // signal the received packet
                                 fibril_condvar_signal(&socket->receive_signal);
@@ -252 +251 @@
                         // push the new socket identifier
                         fibril_mutex_lock(&socket->accept_lock);
-                        if (!ERROR_OCCURRED(dyn_fifo_push(&socket->accepted,
-                            1, SOCKET_MAX_ACCEPTED_SIZE))) {
+                        rc = dyn_fifo_push(&socket->accepted, 1,
+                            SOCKET_MAX_ACCEPTED_SIZE);
+                        if (rc != EOK) {
                                 // signal the accepted socket
                                 fibril_condvar_signal(&socket->accept_signal);
@@ -261 +261 @@
 
                 default:
-                        ERROR_CODE = ENOTSUP;
+                        rc = ENOTSUP;
                 }
 
@@ -280 +280 @@
 
         default:
-                ERROR_CODE = ENOTSUP;
-        }
-
-        ipc_answer_0(callid, (ipcarg_t) ERROR_CODE);
+                rc = ENOTSUP;
+        }
+
+        ipc_answer_0(callid, (ipcarg_t) rc);
         goto loop;
 }
@@ -405 +405 @@
 int socket(int domain, int type, int protocol)
 {
-        ERROR_DECLARE;
-
         socket_ref socket;
         int phone;
@@ -413 +411 @@
         ipcarg_t fragment_size;
         ipcarg_t header_size;
+        int rc;
 
         // find the appropriate service
@@ -479 +478 @@
         }
 
-        if (ERROR_OCCURRED((int) async_req_3_3(phone, NET_SOCKET, socket_id, 0,
-            service, NULL, &fragment_size, &header_size))) {
+        rc = (int) async_req_3_3(phone, NET_SOCKET, socket_id, 0, service, NULL,
+            &fragment_size, &header_size);
+        if (rc != EOK) {
                 fibril_rwlock_write_unlock(&socket_globals.lock);
                 free(socket);
-                return ERROR_CODE;
+                return rc;
         }
 
@@ -492 +492 @@
         socket_initialize(socket, socket_id, phone, service);
         // store the new socket
-        ERROR_CODE = sockets_add(socket_get_sockets(), socket_id, socket);
+        rc = sockets_add(socket_get_sockets(), socket_id, socket);
 
         fibril_rwlock_write_unlock(&socket_globals.lock);
-        if (ERROR_CODE < 0) {
+        if (rc < 0) {
                 dyn_fifo_destroy(&socket->received);
                 dyn_fifo_destroy(&socket->accepted);
@@ -501 +501 @@
                 async_msg_3(phone, NET_SOCKET_CLOSE, (ipcarg_t) socket_id, 0,
                     service);
-                return ERROR_CODE;
+                return rc;
         }
 
@@ -770 +770 @@
 int closesocket(int socket_id)
 {
-        ERROR_DECLARE;
-
         socket_ref socket;
+        int rc;
 
         fibril_rwlock_write_lock(&socket_globals.lock);
@@ -787 +786 @@
 
         // request close
-        ERROR_PROPAGATE((int) async_req_3_0(socket->phone, NET_SOCKET_CLOSE,
-            (ipcarg_t) socket->socket_id, 0, socket->service));
+        rc = (int) async_req_3_0(socket->phone, NET_SOCKET_CLOSE,
+            (ipcarg_t) socket->socket_id, 0, socket->service);
+        if (rc != EOK) {
+                fibril_rwlock_write_unlock(&socket_globals.lock);
+                return rc;
+        }
         // free the socket structure
         socket_destroy(socket);