From 31f339cdc1efc0228a78a309abe0cc3b2ac9e123 Mon Sep 17 00:00:00 2001
From: doursse <doursse>
Date: Fri, 18 Jul 2008 09:38:03 +0000
Subject: [PATCH]  * copy inlined needed functions in evas_array.c, hence
 remove dependancy    of evas_common.h  * use size_t when needed  * add vim
 header

SVN revision: 35153
---
 legacy/evas/src/lib/data/evas_array.c       | 43 +++++++++++++++++++--
 legacy/evas/src/lib/data/evas_array_hash.c  | 10 ++++-
 legacy/evas/src/lib/data/evas_hash.c        | 14 ++++++-
 legacy/evas/src/lib/data/evas_list.c        | 11 +++++-
 legacy/evas/src/lib/data/evas_mempool.c     |  5 +++
 legacy/evas/src/lib/data/evas_mempool.h     |  4 ++
 legacy/evas/src/lib/data/evas_object_list.c | 12 +++++-
 legacy/evas/src/lib/data/evas_stringshare.c | 18 +++++++--
 8 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/legacy/evas/src/lib/data/evas_array.c b/legacy/evas/src/lib/data/evas_array.c
index 7fc33199ce..fd26a79ea9 100644
--- a/legacy/evas/src/lib/data/evas_array.c
+++ b/legacy/evas/src/lib/data/evas_array.c
@@ -1,11 +1,46 @@
-#include "evas_common.h"
-#include "evas_private.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
 
-Evas_Bool
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "Evas_Data.h"
+
+
+#ifdef __GNUC__
+# define UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+# define UNLIKELY(x) (x)
+#endif
+
+
+static Evas_Bool _evas_array_grow(Evas_Array *array);
+
+static inline void
+_evas_array_append(Evas_Array *array, void *data)
+{
+   if (UNLIKELY((array->count + array->step) > array->total))
+     if (!_evas_array_grow(array)) return ;
+
+   array->data[array->count++] = data;
+}
+
+static inline void*
+_evas_array_get(Evas_Array *array, unsigned int index)
+{
+   return array->data[index];
+}
+
+
+static Evas_Bool
 _evas_array_grow(Evas_Array *array)
 {
    void **tmp;
-   unsigned int total;
+   size_t total;
 
    total = array->total + array->step;
    tmp = realloc(array->data, sizeof (void*) * total);
diff --git a/legacy/evas/src/lib/data/evas_array_hash.c b/legacy/evas/src/lib/data/evas_array_hash.c
index 52bc8f547d..003df0ca63 100644
--- a/legacy/evas/src/lib/data/evas_array_hash.c
+++ b/legacy/evas/src/lib/data/evas_array_hash.c
@@ -1,4 +1,12 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "Evas_Data.h"
 
 #define EAH_BUCKETS 256
 #define EAH_HASH(key) \
diff --git a/legacy/evas/src/lib/data/evas_hash.c b/legacy/evas/src/lib/data/evas_hash.c
index 0178955a79..9d36648a58 100644
--- a/legacy/evas/src/lib/data/evas_hash.c
+++ b/legacy/evas/src/lib/data/evas_hash.c
@@ -1,5 +1,15 @@
-#include "evas_common.h"
-#include "evas_private.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "Evas_Data.h"
 
 typedef struct _Evas_Hash_El Evas_Hash_El;
 
diff --git a/legacy/evas/src/lib/data/evas_list.c b/legacy/evas/src/lib/data/evas_list.c
index e4a41c2613..926a495455 100644
--- a/legacy/evas/src/lib/data/evas_list.c
+++ b/legacy/evas/src/lib/data/evas_list.c
@@ -1,8 +1,15 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
-#include "evas_common.h"
-#include "evas_mempool.h"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "Evas_Data.h"
+#include <evas_mempool.h>
 
 typedef struct _Evas_List_Accounting Evas_List_Accounting;
 
diff --git a/legacy/evas/src/lib/data/evas_mempool.c b/legacy/evas/src/lib/data/evas_mempool.c
index f6e06cbf83..6bbf390968 100644
--- a/legacy/evas/src/lib/data/evas_mempool.c
+++ b/legacy/evas/src/lib/data/evas_mempool.c
@@ -2,9 +2,14 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
+#include "Evas_Data.h"
 #include "evas_mempool.h"
 
 //#define NOPOOL
diff --git a/legacy/evas/src/lib/data/evas_mempool.h b/legacy/evas/src/lib/data/evas_mempool.h
index 1cda041142..b1d52837f5 100644
--- a/legacy/evas/src/lib/data/evas_mempool.h
+++ b/legacy/evas/src/lib/data/evas_mempool.h
@@ -1,3 +1,7 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
 #ifndef _EVAS_MEMPOOL_H
 #define _EVAS_MEMPOOL_H
 
diff --git a/legacy/evas/src/lib/data/evas_object_list.c b/legacy/evas/src/lib/data/evas_object_list.c
index b9ef79ff24..d77687c4a1 100644
--- a/legacy/evas/src/lib/data/evas_object_list.c
+++ b/legacy/evas/src/lib/data/evas_object_list.c
@@ -1,4 +1,14 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include "Evas_Data.h"
 
 /* list ops */
 void *
diff --git a/legacy/evas/src/lib/data/evas_stringshare.c b/legacy/evas/src/lib/data/evas_stringshare.c
index 55403ee72d..b05dcdfda6 100644
--- a/legacy/evas/src/lib/data/evas_stringshare.c
+++ b/legacy/evas/src/lib/data/evas_stringshare.c
@@ -1,5 +1,17 @@
-#include "evas_common.h"
-#include "evas_private.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+
+#include "Evas_Data.h"
 
 typedef struct _Evas_Stringshare             Evas_Stringshare;
 typedef struct _Evas_Stringshare_El          Evas_Stringshare_El;
@@ -16,7 +28,7 @@ struct _Evas_Stringshare_El
    int                  references;
 };
 
-static Evas_Stringshare share = 
+static Evas_Stringshare share =
 {
      {
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,