Changeset 736a330 in mainline

Timestamp:

2010-11-07T21:12:33Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9ee9d5d

Parents:

278b97b1

Message:

Get rid of the ERROR_CODE madness in generic char map.

File:

• uspace/lib/c/include/adt/generic_char_map.h (modified) (4 diffs)

uspace/lib/c/include/adt/generic_char_map.h

@@ -40 +40 @@
 #include <unistd.h>
 #include <errno.h>
-#include <err.h>
 
 #include <adt/char_map.h>
@@ -85 +84 @@
              type *value) \
         { \
-                ERROR_DECLARE; \
+                int rc; \
                 int index; \
                 if (!name##_is_valid(map)) \
@@ -92 +91 @@
                 if (index < 0) \
                         return index; \
-                if (ERROR_OCCURRED(char_map_add(&map->names, name, length, \
-                    index))) { \
+                rc = char_map_add(&map->names, name, length, index); \
+                if (rc != EOK) { \
                         name##_items_exclude_index(&map->values, index); \
-                        return ERROR_CODE; \
+                        return rc; \
                 } \
                 return EOK; \
@@ -141 +140 @@
         int name##_initialize(name##_ref map) \
         { \
-                ERROR_DECLARE; \
+                int rc; \
                 if (!map) \
                         return EINVAL; \
-                ERROR_PROPAGATE(char_map_initialize(&map->names)); \
-                if (ERROR_OCCURRED(name##_items_initialize(&map->values))) { \
+                rc = char_map_initialize(&map->names); \
+                if (rc != EOK) \
+                        return rc; \
+                rc = name##_items_initialize(&map->values); \
+                if (rc != EOK) { \
                         char_map_destroy(&map->names); \
-                        return ERROR_CODE; \
+                        return rc; \
                 } \
                 map->magic = GENERIC_CHAR_MAP_MAGIC_VALUE; \