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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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>
@@ -47 +46 @@
 /** Internal magic value for a&nbsp;map consistency check. */
 #define GENERIC_CHAR_MAP_MAGIC_VALUE    0x12345622
+
+/** Generic destructor function pointer. */
+#define DTOR_T(identifier) \
+        void (*identifier)(const void *)
 
 /** Character string to generic type map declaration.
@@ -56 +59 @@
         \
         typedef struct name name##_t; \
-        typedef name##_t *name##_ref; \
         \
         struct  name { \
@@ -64 +66 @@
         }; \
         \
-        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 uint8_t *, const size_t, type *); \
+        int name##_count(name##_t *); \
+        void name##_destroy(name##_t *, DTOR_T()); \
+        void name##_exclude(name##_t *, const uint8_t *, const size_t, DTOR_T()); \
+        type *name##_find(name##_t *, const uint8_t *, const size_t); \
+        int name##_initialize(name##_t *); \
+        int name##_is_valid(name##_t *);
 
 /** Character string to generic type map implementation.
@@ -76 +78 @@
  * Should follow declaration with the same parameters.
  *
- * @param[in] name      Name of the map.
- * @param[in] type      Inner object type.
+ * @param[in] name Name of the map.
+ * @param[in] type Inner object type.
+ *
  */
 #define GENERIC_CHAR_MAP_IMPLEMENT(name, type) \
         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 uint8_t *name, const size_t length, \
              type *value) \
         { \
-                ERROR_DECLARE; \
                 int index; \
                 if (!name##_is_valid(map)) \
@@ -92 +94 @@
                 if (index < 0) \
                         return index; \
-                if (ERROR_OCCURRED(char_map_add(&map->names, name, length, \
-                    index))) { \
-                        name##_items_exclude_index(&map->values, index); \
-                        return ERROR_CODE; \
-                } \
-                return EOK; \
+                return char_map_add(&map->names, name, length, index); \
         } \
         \
-        int name##_count(name##_ref map) \
+        int name##_count(name##_t *map) \
         { \
                 return name##_is_valid(map) ? \
@@ -106 +103 @@
         } \
         \
-        void name##_destroy(name##_ref map) \
+        void name##_destroy(name##_t *map, DTOR_T(dtor)) \
         { \
                 if (name##_is_valid(map)) { \
                         char_map_destroy(&map->names); \
-                        name##_items_destroy(&map->values); \
+                        name##_items_destroy(&map->values, dtor); \
                 } \
         } \
         \
-        void name##_exclude(name##_ref map, const char *name, \
-            const size_t length) \
+        void name##_exclude(name##_t *map, const uint8_t *name, \
+            const size_t length, DTOR_T(dtor)) \
         { \
                 if (name##_is_valid(map)) { \
@@ -122 +119 @@
                         if (index != CHAR_MAP_NULL) \
                                 name##_items_exclude_index(&map->values, \
-                                     index); \
+                                     index, dtor); \
                 } \
         } \
         \
-        type *name##_find(name##_ref map, const char *name, \
+        type *name##_find(name##_t *map, const uint8_t *name, \
             const size_t length) \
         { \
@@ -139 +136 @@
         } \
         \
-        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 +153 @@
         } \
         \
-        int name##_is_valid(name##_ref map) \
+        int name##_is_valid(name##_t *map) \
         { \
                 return map && (map->magic == GENERIC_CHAR_MAP_MAGIC_VALUE); \