Changeset aaa3f33a in mainline for uspace/lib/c/include/adt/generic_field.h

Timestamp:

2010-11-19T21:26:08Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a7811f17, cc3c2a1c

Parents:

4eca056

Message:

Remove xxx_ref typedefs (part 5).

File:

• uspace/lib/c/include/adt/generic_field.h (modified) (8 diffs)

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

@@ -53 +53 @@
 #define GENERIC_FIELD_DECLARE(name, type) \
         typedef struct name name##_t; \
-        typedef name##_t *name##_ref; \
         \
         struct  name { \
@@ -62 +61 @@
         }; \
         \
-        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 *); \
+        void name##_exclude_index(name##_t *, int); \
+        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 +78 @@
  */
 #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)) { \
@@ -99 +98 @@
         } \
         \
-        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) \
         { \
                 if (name##_is_valid(field)) { \
@@ -117 +116 @@
         } \
          \
-        void name##_exclude_index(name##_ref field, int index) \
+        void name##_exclude_index(name##_t *field, int index) \
         { \
                 if (name##_is_valid(field) && (index >= 0) && \
@@ -126 +125 @@
         } \
          \
-        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 +133 @@
         } \
         \
-        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 +152 @@
         } \
         \
-        int name##_is_valid(name##_ref field) \
+        int name##_is_valid(name##_t *field) \
         { \
                 return field && (field->magic == GENERIC_FIELD_MAGIC_VALUE); \