Changeset 16ac756 in mainline for uspace/lib/c/generic/net/packet.c

Timestamp:

2010-11-07T19:47:27Z (13 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.

File:

• uspace/lib/c/generic/net/packet.c (modified) (4 diffs)

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) >=