Changeset ad7a6c9 in mainline for uspace/lib/c/include/adt/generic_field.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_field.h (modified) (4 diffs)

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

@@ -46 +46 @@
 #define GENERIC_FIELD_MAGIC_VALUE               0x55667788
 
+/** Generic destructor function pointer. */
+#define DTOR_T(identifier) \
+        void (*identifier)(const void *)
+
 /** Generic type field declaration.
  *
@@ -63 +67 @@
         int name##_add(name##_t *, type *); \
         int name##_count(name##_t *); \
-        void name##_destroy(name##_t *); \
-        void name##_exclude_index(name##_t *, int); \
+        void name##_destroy(name##_t *, DTOR_T()); \
+        void name##_exclude_index(name##_t *, int, DTOR_T()); \
         type **name##_get_field(name##_t *); \
         type *name##_get_index(name##_t *, int); \
@@ -103 +107 @@
         } \
         \
-        void name##_destroy(name##_t *field) \
+        void name##_destroy(name##_t *field, DTOR_T(dtor)) \
         { \
                 if (name##_is_valid(field)) { \
                         int index; \
                         field->magic = 0; \
-                        for (index = 0; index < field->next; index++) { \
-                                if (field->items[index]) \
-                                        free(field->items[index]); \
+                        if (dtor) { \
+                                for (index = 0; index < field->next; index++) { \
+                                        if (field->items[index]) \
+                                                dtor(field->items[index]); \
+                                } \
                         } \
                         free(field->items); \
@@ -116 +122 @@
         } \
          \
-        void name##_exclude_index(name##_t *field, int index) \
+        void name##_exclude_index(name##_t *field, int index, DTOR_T(dtor)) \
         { \
                 if (name##_is_valid(field) && (index >= 0) && \
                     (index < field->next) && (field->items[index])) { \
-                        free(field->items[index]); \
+                        if (dtor) \
+                                dtor(field->items[index]); \
                         field->items[index] = NULL; \
                 } \