Converted the int_array to a generic array that can be used also for other types

Author: Robin Müller

src/Makefile.am

@@ -1,2 +1,2 @@
 bin_PROGRAMS = touch_gestures
-touch_gestures_SOURCES = main.c int_array.c gestures_device.c gesture_detection.c configuraion.c
+touch_gestures_SOURCES = main.c array.c gestures_device.c gesture_detection.c configuraion.c

src/int_array.c renamed to src/array.c

@@ -24,17 +24,18 @@
 
 #include <stdlib.h>
 
-#include "int_array.h"
+#include "array.h"
 
-int_array_t *new_int_array(size_t length) {
-  int_array_t *array;
-  /* we're allocating the size of basic t_int_array 
-     (which already contains space for one int)
-     and additional space for length-1 ints */
-  array = malloc(sizeof(int_array_t) + sizeof(int) * (length - 1));
+void *new_array(size_t length, size_t struct_size, size_t type_size) {
+  void *array;
+  /* we're allocating the size of basic array struct 
+     (which already contains space for one type)
+     and additional space for length-1 type */
+  array = malloc(struct_size + type_size * (length - 1));
   if(!array) {
     return 0;
   }
-  array->length = length;
+  // the length is locatated at the beginning of the stuct
+  *(size_t*) array = length;
   return array;
 }

src/array.h

@@ -0,0 +1,32 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Robin Müller.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef ARRAY_H_
+#define ARRAY_H_
+
+#include <stddef.h>
+
+void *new_array(size_t length, size_t struct_size, size_t type_size);
+
+#endif // ARRAY_H_

src/input_event_array.h

@@ -0,0 +1,39 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Robin Müller.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef INPUT_EVENT_ARRAY_H_
+#define INPUT_EVENT_ARRAY_H_
+
+#include <linux/input.h>
+
+#include "array.h"
+
+typedef struct input_event_array {
+  size_t length;
+  struct input_event data[1];
+} input_event_array_t;
+
+#define new_input_event_array(length) (input_event_array_t*) new_array(length, sizeof(input_event_array_t), sizeof(struct input_event))
+
+#endif // INPUT_EVENT_ARRAY_H_

src/int_array.h

@@ -22,18 +22,16 @@
  * THE SOFTWARE.
  */
 
-#ifndef INTEGER_ARRAY_H_
-#define INTEGER_ARRAY_H_
+#ifndef INT_ARRAY_H_
+#define INT_ARRAY_H_
 
-#include <stddef.h>
+#include "array.h"
 
-struct int_array {
+typedef struct int_array {
   size_t length;
   int data[1];
-};
+} int_array_t;
 
-typedef struct int_array int_array_t;
+#define new_int_array(length) (int_array_t*) new_array(length, sizeof(int_array_t), sizeof(int))
 
-int_array_t * new_int_array(size_t length);
-
-#endif // INTEGER_ARRAY_H_
+#endif // INT_ARRAY_H_