Changes in uspace/lib/net/tl/tl_common.c [0ab68f6:84c20da] in mainline

File:

• uspace/lib/net/tl/tl_common.c (modified) (5 diffs)

uspace/lib/net/tl/tl_common.c

@@ -54 +54 @@
 #include <ipc/services.h>
 #include <errno.h>
+#include <err.h>
 
 DEVICE_MAP_IMPLEMENT(packet_dimensions, packet_dimension_t);
@@ -123 +124 @@
     packet_dimension_ref *packet_dimension)
 {
-        int rc;
+        ERROR_DECLARE;
         
         if (!packet_dimension)
@@ -136 +137 @@
                         return ENOMEM;
                 
-                rc = ip_packet_size_req(ip_phone, device_id, *packet_dimension);
-                if (rc != EOK) {
+                if (ERROR_OCCURRED(ip_packet_size_req(ip_phone, device_id,
+                    *packet_dimension))) {
                         free(*packet_dimension);
-                        return rc;
+                        return ERROR_CODE;
                 }
                 
-                rc = packet_dimensions_add(packet_dimensions, device_id,
+                ERROR_CODE = packet_dimensions_add(packet_dimensions, device_id,
                     *packet_dimension);
-                if (rc < 0) {
+                if (ERROR_CODE < 0) {
                         free(*packet_dimension);
-                        return rc;
+                        return ERROR_CODE;
                 }
         }
@@ -291 +292 @@
     socklen_t addrlen)
 {
+        ERROR_DECLARE;
+
         ipc_callid_t callid;
         size_t length;
-        void *data;
-        int rc;
+        void * data;
 
         if (!dimension)
@@ -317 +319 @@
 
         // read the data into the packet
-        rc = async_data_write_finalize(callid, data, length);
-        if (rc != EOK) {
+        if (ERROR_OCCURRED(async_data_write_finalize(callid, data, length)) ||
+            // set the packet destination address
+            ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr,
+            addrlen))) {
                 pq_release_remote(packet_phone, packet_get_id(*packet));
-                return rc;
-        }
-        
-        // set the packet destination address
-        rc = packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen);
-        if (rc != EOK) {
-                pq_release_remote(packet_phone, packet_get_id(*packet));
-                return rc;
+                return ERROR_CODE;
         }