Changeset b5e68c8 in mainline for uspace/lib/c/include/adt/generic_field.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_field.h (modified) (9 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.
  *
@@ -53 +57 @@
 #define GENERIC_FIELD_DECLARE(name, type) \
         typedef struct name name##_t; \
-        typedef name##_t *name##_ref; \
         \
         struct  name { \
@@ -62 +65 @@
         }; \
         \
-        int name##_add(name##_ref, type *); \
-        int name##_count(name##_ref); \
-        void name##_destroy(name##_ref); \
-        void name##_exclude_index(name##_ref, int); \
-        type **name##_get_field(name##_ref); \
-        type *name##_get_index(name##_ref, int); \
-        int name##_initialize(name##_ref); \
-        int name##_is_valid(name##_ref);
+        int name##_add(name##_t *, type *); \
+        int name##_count(name##_t *); \
+        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); \
+        int name##_initialize(name##_t *); \
+        int name##_is_valid(name##_t *);
 
 /** Generic type field implementation.
@@ -79 +82 @@
  */
 #define GENERIC_FIELD_IMPLEMENT(name, type) \
-        int name##_add(name##_ref field, type *value) \
+        int name##_add(name##_t *field, type *value) \
         { \
                 if (name##_is_valid(field)) { \
@@ -92 +95 @@
                         } \
                         field->items[field->next] = value; \
-                        ++field->next; \
+                        field->next++; \
                         field->items[field->next] = NULL; \
                         return field->next - 1; \
@@ -99 +102 @@
         } \
         \
-        int name##_count(name##_ref field) \
+        int name##_count(name##_t *field) \
         { \
                 return name##_is_valid(field) ? field->next : -1; \
         } \
         \
-        void name##_destroy(name##_ref 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); \
@@ -117 +122 @@
         } \
          \
-        void name##_exclude_index(name##_ref 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; \
                 } \
         } \
          \
-        type *name##_get_index(name##_ref field, int index) \
+        type *name##_get_index(name##_t *field, int index) \
         { \
                 if (name##_is_valid(field) && (index >= 0) && \
@@ -134 +140 @@
         } \
         \
-        type **name##_get_field(name##_ref field) \
+        type **name##_get_field(name##_t *field) \
         { \
                 return name##_is_valid(field) ? field->items : NULL; \
         } \
         \
-        int name##_initialize(name##_ref field) \
+        int name##_initialize(name##_t *field) \
         { \
                 if (!field) \
@@ -153 +159 @@
         } \
         \
-        int name##_is_valid(name##_ref field) \
+        int name##_is_valid(name##_t *field) \
         { \
                 return field && (field->magic == GENERIC_FIELD_MAGIC_VALUE); \