Oops.

[apps/pfixtools.git] / common / array.h

diff --git a/common/array.h b/common/array.h
index e4cf094..dadce33 100644 (file)
--- a/common/array.h
+++ b/common/array.h
@@ -46,6 +46,22 @@
         ssize_t len;                                                           \
         ssize_t size;                                                          \
     }
+
+#define PARRAY(Type)                                                           \
+    typedef PRIV_ARRAY(Type*) Type ## _ptr_array_t;                            \
+    static inline Type ## _ptr_array_t *Type ## _ptr_array_new(void)           \
+    {                                                                          \
+        return p_new(Type ## _ptr_array_t, 1);                                 \
+    }                                                                          \
+                                                                               \
+    static inline void Type ## _ptr_array_delete(Type ## _ptr_array_t **array) \
+    {                                                                          \
+        if (*array) {                                                          \
+            array_wipe(**array);                                               \
+            p_delete(array);                                                   \
+        }                                                                      \
+    }
+
 #define ARRAY(Type)                                                            \
     typedef PRIV_ARRAY(Type) Type ## _array_t;                                 \
                                                                                \
@@ -60,8 +76,12 @@
             array_wipe(**array);                                               \
             p_delete(array);                                                   \
         }                                                                      \
-    }
+    }                                                                          \
+                                                                               \
+    PARRAY(Type)
+
 #define A(Type) Type ## _array_t
+#define PA(Type) Type ## _ptr_array_t
 
 #define ARRAY_INIT { NULL, 0, 0 }
 
@@ -109,6 +129,10 @@
 #define array_elt(array, n) (array).data[(n)]
 #define array_ptr(array, n) (array).data + (n)
 
+#define foreach(var, array)                                                    \
+    for (int __Ai = 0 ; __Ai < (array).len ; ++__Ai) {                         \
+        var = array_ptr(array, __Ai);
+
 #define array_foreach(array, action)                                           \
     for (int __Ai = 0 ; __Ai < (array).len ; ++__Ai) {                         \
         action(array_ptr(array, __Ai));                                        \
@@ -120,12 +144,15 @@
     } while (0)
 
 #define array_lock(array)                                                      \
-    !(mlock((array).data, (array).len * sizeof(*(array).data)) != 0)
+    (mlock((array).data, (array).len * sizeof(*(array).data)) == 0)
 #define array_unlock(array)                                                    \
     (void)munlock((array).data, (array).len * sizeof(*(array).data))
 
 ARRAY(char)
 ARRAY(int)
+ARRAY(bool)
 ARRAY(uint32_t)
 
+PARRAY(void)
+
 #endif