Changeset 8fb1bf82 in mainline for uspace/lib/c/include/adt/generic_char_map.h

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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 mainline changes.

File:

• uspace/lib/c/include/adt/generic_char_map.h (modified) (10 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>
@@ -56 +55 @@
         \
         typedef struct name name##_t; \
-        typedef name##_t *name##_ref; \
         \
         struct  name { \
@@ -64 +62 @@
         }; \
         \
-        int name##_add(name##_ref, const char *, const size_t, type *); \
-        int name##_count(name##_ref); \
-        void name##_destroy(name##_ref); \
-        void name##_exclude(name##_ref, const char *, const size_t); \
-        type *name##_find(name##_ref, const char *, const size_t); \
-        int name##_initialize(name##_ref); \
-        int name##_is_valid(name##_ref);
+        int name##_add(name##_t *, const char *, const size_t, type *); \
+        int name##_count(name##_t *); \
+        void name##_destroy(name##_t *); \
+        void name##_exclude(name##_t *, const char *, const size_t); \
+        type *name##_find(name##_t *, const char *, const size_t); \
+        int name##_initialize(name##_t *); \
+        int name##_is_valid(name##_t *);
 
 /** Character string to generic type map implementation.
@@ -82 +80 @@
         GENERIC_FIELD_IMPLEMENT(name##_items, type) \
         \
-        int name##_add(name##_ref map, const char *name, const size_t length, \
+        int name##_add(name##_t *map, const char *name, const size_t length, \
              type *value) \
         { \
-                ERROR_DECLARE; \
+                int rc; \
                 int index; \
                 if (!name##_is_valid(map)) \
@@ -92 +90 @@
                 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; \
         } \
         \
-        int name##_count(name##_ref map) \
+        int name##_count(name##_t *map) \
         { \
                 return name##_is_valid(map) ? \
@@ -106 +104 @@
         } \
         \
-        void name##_destroy(name##_ref map) \
+        void name##_destroy(name##_t *map) \
         { \
                 if (name##_is_valid(map)) { \
@@ -114 +112 @@
         } \
         \
-        void name##_exclude(name##_ref map, const char *name, \
+        void name##_exclude(name##_t *map, const char *name, \
             const size_t length) \
         { \
@@ -126 +124 @@
         } \
         \
-        type *name##_find(name##_ref map, const char *name, \
+        type *name##_find(name##_t *map, const char *name, \
             const size_t length) \
         { \
@@ -139 +137 @@
         } \
         \
-        int name##_initialize(name##_ref map) \
+        int name##_initialize(name##_t *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; \
@@ -153 +154 @@
         } \
         \
-        int name##_is_valid(name##_ref map) \
+        int name##_is_valid(name##_t *map) \
         { \
                 return map && (map->magic == GENERIC_CHAR_MAP_MAGIC_VALUE); \