Changeset 3090715 in mainline for uspace/lib/net/tl/socket_core.c

Timestamp:

2010-11-07T21:16:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1d0d06a

Parents:

9ce7eb5 (diff), 9ee9d5d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net/.

File:

• uspace/lib/net/tl/socket_core.c (modified) (13 diffs)

uspace/lib/net/tl/socket_core.c

@@ -48 +48 @@
 #include <stdlib.h>
 #include <errno.h>
-#include <err.h>
 
 #include <adt/dynamic_fifo.h>
@@ -164 +163 @@
     const char *key, size_t key_length)
 {
-        ERROR_DECLARE;
-
         socket_core_ref *socket_ref;
+        int rc;
 
         // create a wrapper
@@ -175 +173 @@
         *socket_ref = socket;
         // add the wrapper
-        if (ERROR_OCCURRED(socket_port_map_add(&socket_port->map, key,
-            key_length, socket_ref))) {
+        rc = socket_port_map_add(&socket_port->map, key, key_length,
+            socket_ref);
+        if (rc != EOK) {
                 free(socket_ref);
-                return ERROR_CODE;
+                return rc;
         }
         
@@ -204 +203 @@
     int port)
 {
-        ERROR_DECLARE;
-
         socket_port_ref socket_port;
+        int rc;
 
         // create a wrapper
@@ -214 +212 @@
 
         socket_port->count = 0;
-        if (ERROR_OCCURRED(socket_port_map_initialize(&socket_port->map)) ||
-            ERROR_OCCURRED(socket_port_add_core(socket_port, socket,
-            SOCKET_MAP_KEY_LISTENING, 0))) {
-                socket_port_map_destroy(&socket_port->map);
-                free(socket_port);
-                return ERROR_CODE;
-        }
+        rc = socket_port_map_initialize(&socket_port->map);
+        if (rc != EOK)
+                goto fail;
+        
+        rc = socket_port_add_core(socket_port, socket, SOCKET_MAP_KEY_LISTENING,
+            0);
+        if (rc != EOK)
+                goto fail;
         
         // register the incomming port
-        ERROR_CODE = socket_ports_add(global_sockets, port, socket_port);
-        if (ERROR_CODE < 0) {
-                socket_port_map_destroy(&socket_port->map);
-                free(socket_port);
-                return ERROR_CODE;
-        }
+        rc = socket_ports_add(global_sockets, port, socket_port);
+        if (rc < 0)
+                goto fail;
         
         socket->port = port;
         return EOK;
+
+fail:
+        socket_port_map_destroy(&socket_port->map);
+        free(socket_port);
+        return rc;
+        
 }
 
@@ -416 +418 @@
     void *specific_data, int *socket_id)
 {
-        ERROR_DECLARE;
-
         socket_core_ref socket;
-        int res;
         int positive;
+        int rc;
 
         if (!socket_id)
@@ -447 +447 @@
         socket->key_length = 0;
         socket->specific_data = specific_data;
-        if (ERROR_OCCURRED(dyn_fifo_initialize(&socket->received,
-            SOCKET_INITIAL_RECEIVED_SIZE))) {
+        rc = dyn_fifo_initialize(&socket->received, SOCKET_INITIAL_RECEIVED_SIZE);
+        if (rc != EOK) {
                 free(socket);
-                return ERROR_CODE;
-        }
-        if (ERROR_OCCURRED(dyn_fifo_initialize(&socket->accepted,
-            SOCKET_INITIAL_ACCEPTED_SIZE))) {
+                return rc;
+        }
+        
+        rc = dyn_fifo_initialize(&socket->accepted, SOCKET_INITIAL_ACCEPTED_SIZE);
+        if (rc != EOK) {
                 dyn_fifo_destroy(&socket->received);
                 free(socket);
-                return ERROR_CODE;
+                return rc;
         }
         socket->socket_id = *socket_id;
-        res = socket_cores_add(local_sockets, socket->socket_id, socket);
-        if (res < 0) {
+        rc = socket_cores_add(local_sockets, socket->socket_id, socket);
+        if (rc < 0) {
                 dyn_fifo_destroy(&socket->received);
                 dyn_fifo_destroy(&socket->accepted);
                 free(socket);
-                return res;
+                return rc;
         }
         
@@ -523 +524 @@
 int socket_reply_packets(packet_t packet, size_t *length)
 {
-        ERROR_DECLARE;
-
         packet_t next_packet;
         size_t fragments;
         size_t *lengths;
         size_t index;
+        int rc;
 
         if (!length)
@@ -536 +536 @@
         if (!next_packet) {
                 // write all if only one fragment
-                ERROR_PROPAGATE(data_reply(packet_get_data(packet),
-                    packet_get_data_length(packet)));
+                rc = data_reply(packet_get_data(packet),
+                    packet_get_data_length(packet));
+                if (rc != EOK)
+                        return rc;
                 // store the total length
                 *length = packet_get_data_length(packet);
@@ -564 +566 @@
                 
                 // write the fragment lengths
-                if (ERROR_OCCURRED(data_reply(lengths,
-                    sizeof(int) * (fragments + 1)))) {
+                rc = data_reply(lengths, sizeof(int) * (fragments + 1));
+                if (rc != EOK) {
                         free(lengths);
-                        return ERROR_CODE;
+                        return rc;
                 }
                 next_packet = packet;
@@ -573 +575 @@
                 // write the fragments
                 for (index = 0; index < fragments; ++index) {
-                        ERROR_CODE = data_reply(packet_get_data(next_packet),
+                        rc = data_reply(packet_get_data(next_packet),
                             lengths[index]);
-                        if (ERROR_OCCURRED(ERROR_CODE)) {
+                        if (rc != EOK) {
                                 free(lengths);
-                                return ERROR_CODE;
+                                return rc;
                         }
                         next_packet = pq_next(next_packet);
@@ -680 +682 @@
     socket_core_ref socket, const char *key, size_t key_length)
 {
-        ERROR_DECLARE;
-
         socket_port_ref socket_port;
+        int rc;
 
         // find ports
@@ -690 +691 @@
         
         // add the socket
-        ERROR_PROPAGATE(socket_port_add_core(socket_port, socket, key,
-            key_length));
+        rc = socket_port_add_core(socket_port, socket, key, key_length);
+        if (rc != EOK)
+                return rc;
         
         socket->port = port;