Changes in uspace/lib/c/include/adt/generic_char_map.h [5fe7692:61bfc370] in mainline

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.
@@ -68 +64 @@
         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()); \
+        void name##_destroy(name##_t *); \
+        void name##_exclude(name##_t *, const uint8_t *, const size_t); \
         type *name##_find(name##_t *, const uint8_t *, const size_t); \
         int name##_initialize(name##_t *); \
@@ -88 +84 @@
              type *value) \
         { \
+                int rc; \
                 int index; \
                 if (!name##_is_valid(map)) \
@@ -94 +91 @@
                 if (index < 0) \
                         return index; \
-                return 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 rc; \
+                } \
+                return EOK; \
         } \
         \
@@ -103 +105 @@
         } \
         \
-        void name##_destroy(name##_t *map, DTOR_T(dtor)) \
+        void name##_destroy(name##_t *map) \
         { \
                 if (name##_is_valid(map)) { \
                         char_map_destroy(&map->names); \
-                        name##_items_destroy(&map->values, dtor); \
+                        name##_items_destroy(&map->values); \
                 } \
         } \
         \
         void name##_exclude(name##_t *map, const uint8_t *name, \
-            const size_t length, DTOR_T(dtor)) \
+            const size_t length) \
         { \
                 if (name##_is_valid(map)) { \
@@ -119 +121 @@
                         if (index != CHAR_MAP_NULL) \
                                 name##_items_exclude_index(&map->values, \
-                                     index, dtor); \
+                                     index); \
                 } \
         } \