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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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) (6 diffs)

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

@@ -47 +47 @@
 #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.
  *  @param[in] name     Name of the map.
@@ -62 +66 @@
         }; \
         \
-        int name##_add(name##_t *, const char *, const size_t, type *); \
+        int name##_add(name##_t *, const uint8_t *, 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); \
+        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 *);
@@ -74 +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##_t *map, const char *name, const size_t length, \
+        int name##_add(name##_t *map, const uint8_t *name, const size_t length, \
              type *value) \
         { \
-                int rc; \
                 int index; \
                 if (!name##_is_valid(map)) \
@@ -90 +94 @@
                 if (index < 0) \
                         return index; \
-                rc = char_map_add(&map->names, name, length, index); \
-                if (rc != EOK) { \
-                        name##_items_exclude_index(&map->values, index); \
-                        return rc; \
-                } \
-                return EOK; \
+                return char_map_add(&map->names, name, length, index); \
         } \
         \
@@ -104 +103 @@
         } \
         \
-        void name##_destroy(name##_t *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##_t *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)) { \
@@ -120 +119 @@
                         if (index != CHAR_MAP_NULL) \
                                 name##_items_exclude_index(&map->values, \
-                                     index); \
+                                     index, dtor); \
                 } \
         } \
         \
-        type *name##_find(name##_t *map, const char *name, \
+        type *name##_find(name##_t *map, const uint8_t *name, \
             const size_t length) \
         { \