From 86f58ba63905ddf175087b329afe00eca383d406 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Wed, 30 Jul 2008 13:35:49 +0000
Subject: [PATCH] Use only the needed headers per file and remove some warning.

SVN revision: 35253
---
 legacy/eina/src/include/eina_error.h   |  2 ++
 legacy/eina/src/include/eina_file.h    |  2 ++
 legacy/eina/src/include/eina_hash.h    |  2 ++
 legacy/eina/src/include/eina_inlist.h  |  2 ++
 legacy/eina/src/include/eina_lalloc.h  |  2 ++
 legacy/eina/src/include/eina_list.h    |  2 ++
 legacy/eina/src/include/eina_mempool.h |  2 ++
 legacy/eina/src/include/eina_module.h  |  3 +++
 legacy/eina/src/include/eina_private.h |  3 +--
 legacy/eina/src/lib/eina_error.c       | 11 ++++++-----
 legacy/eina/src/lib/eina_file.c        | 11 ++++++-----
 legacy/eina/src/lib/eina_hash.c        | 16 +++-------------
 legacy/eina/src/lib/eina_inlist.c      |  2 +-
 legacy/eina/src/lib/eina_lalloc.c      |  2 +-
 legacy/eina/src/lib/eina_list.c        |  2 +-
 legacy/eina/src/lib/eina_mempool.c     |  4 +++-
 legacy/eina/src/lib/eina_module.c      |  3 ++-
 17 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/legacy/eina/src/include/eina_error.h b/legacy/eina/src/include/eina_error.h
index 9534f2737a..38d8e18af9 100644
--- a/legacy/eina/src/include/eina_error.h
+++ b/legacy/eina/src/include/eina_error.h
@@ -1,6 +1,8 @@
 #ifndef EINA_ERROR_H_
 #define EINA_ERROR_H_
 
+#include "eina_types.h"
+
 #define EINA_ERROR_PERR(fmt, ...) \
 	eina_error_print(EINA_ERROR_LEVEL_ERR, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
 
diff --git a/legacy/eina/src/include/eina_file.h b/legacy/eina/src/include/eina_file.h
index d74167b4a8..a2e5cbeb93 100644
--- a/legacy/eina/src/include/eina_file.h
+++ b/legacy/eina/src/include/eina_file.h
@@ -1,6 +1,8 @@
 #ifndef EINA_FILE_H_
 #define EINA_FILE_H_
 
+#include "eina_types.h"
+
 /**
  * @defgroup File_Group Memory File
  * @{
diff --git a/legacy/eina/src/include/eina_hash.h b/legacy/eina/src/include/eina_hash.h
index 36bbd43886..b09b6cb08c 100644
--- a/legacy/eina/src/include/eina_hash.h
+++ b/legacy/eina/src/include/eina_hash.h
@@ -1,6 +1,8 @@
 #ifndef EINA_HASH_H_
 #define EINA_HASH_H_
 
+#include "eina_types.h"
+
 /**
  *
  */
diff --git a/legacy/eina/src/include/eina_inlist.h b/legacy/eina/src/include/eina_inlist.h
index 0fc7eb7562..dba38a4be0 100644
--- a/legacy/eina/src/include/eina_inlist.h
+++ b/legacy/eina/src/include/eina_inlist.h
@@ -1,6 +1,8 @@
 #ifndef EINA_INLIST_H_
 #define EINA_INLIST_H_
 
+#include "eina_types.h"
+
 /**
  * @defgroup Inline_List_Group Inline List
  * @{
diff --git a/legacy/eina/src/include/eina_lalloc.h b/legacy/eina/src/include/eina_lalloc.h
index 9d57930c59..cb629f57fe 100644
--- a/legacy/eina/src/include/eina_lalloc.h
+++ b/legacy/eina/src/include/eina_lalloc.h
@@ -1,6 +1,8 @@
 #ifndef EINA_LALLOC_H_
 #define EINA_LALLOC_H_
 
+#include "eina_types.h"
+
 /**
  * @defgroup Array_Group Array
  * @{
diff --git a/legacy/eina/src/include/eina_list.h b/legacy/eina/src/include/eina_list.h
index 64fd78011b..4109b007c1 100644
--- a/legacy/eina/src/include/eina_list.h
+++ b/legacy/eina/src/include/eina_list.h
@@ -1,6 +1,8 @@
 #ifndef EINA_LIST_H_
 #define EINA_LIST_H_
 
+#include "eina_types.h"
+
 /**
  * @defgroup List_Group List
  * @{
diff --git a/legacy/eina/src/include/eina_mempool.h b/legacy/eina/src/include/eina_mempool.h
index efca921a5f..07cb5fa54d 100644
--- a/legacy/eina/src/include/eina_mempool.h
+++ b/legacy/eina/src/include/eina_mempool.h
@@ -1,6 +1,8 @@
 #ifndef EINA_MEMPOOL_H_
 #define EINA_MEMPOOL_H_
 
+#include "eina_types.h"
+
 /**
  * @defgroup Memory_Pool_Group Memory Pool
  * @{
diff --git a/legacy/eina/src/include/eina_module.h b/legacy/eina/src/include/eina_module.h
index 2c938dd7f4..7b726e48e1 100644
--- a/legacy/eina/src/include/eina_module.h
+++ b/legacy/eina/src/include/eina_module.h
@@ -1,6 +1,9 @@
 #ifndef EINA_MODULE_H_
 #define EINA_MODULE_H_
 
+#include "eina_types.h"
+#include "eina_list.h"
+
 /**
  * @defgroup Module_Group Module
  * @{
diff --git a/legacy/eina/src/include/eina_private.h b/legacy/eina/src/include/eina_private.h
index b84ad964e9..8dbec0cd49 100644
--- a/legacy/eina/src/include/eina_private.h
+++ b/legacy/eina/src/include/eina_private.h
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <stddef.h>
@@ -18,7 +17,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <dirent.h>
-
+#include <string.h>
 
 #define DEBUG
 #include <assert.h>
diff --git a/legacy/eina/src/lib/eina_error.c b/legacy/eina/src/lib/eina_error.c
index b4e10dbcf2..5d26f575ac 100644
--- a/legacy/eina/src/lib/eina_error.c
+++ b/legacy/eina/src/lib/eina_error.c
@@ -1,4 +1,5 @@
-#include "Eina.h"
+#include "eina_error.h"
+#include "eina_list.h"
 #include "eina_private.h"
 /* TODO
  * + printing errors to stdout or stderr can be implemented
@@ -24,9 +25,9 @@ static int _err;
 
 
 #ifdef DEBUG
-static _error_level = EINA_ERROR_LEVEL_DBG;
+static Eina_Error_Level _error_level = EINA_ERROR_LEVEL_DBG;
 #else
-static _error_level = EINA_ERROR_LEVEL_ERR;
+static Eina_Error_Level _error_level = EINA_ERROR_LEVEL_ERR;
 #endif
 
 static char *_colors[EINA_ERROR_LEVELS] = {
@@ -67,7 +68,7 @@ EAPI int eina_error_init(void)
 		char *level;
 		/* TODO register the eina's basic errors */
 		/* TODO load the environment variable for getting the log level */
-		if (level = getenv("EINA_ERROR_LEVEL"))
+		if ((level = getenv("EINA_ERROR_LEVEL")))
 		{
 			_error_level = atoi(level);
 		}
@@ -119,7 +120,7 @@ EAPI int eina_error_get(void)
 /**
  *  
  */
-EAPI int eina_error_set(int err)
+EAPI void eina_error_set(int err)
 {
 	_err = err;
 }
diff --git a/legacy/eina/src/lib/eina_file.c b/legacy/eina/src/lib/eina_file.c
index a69db84545..dab979fbfd 100644
--- a/legacy/eina/src/lib/eina_file.c
+++ b/legacy/eina/src/lib/eina_file.c
@@ -1,4 +1,7 @@
-#include "Eina.h"
+#define _GNU_SOURCE
+#include <string.h>
+
+#include "eina_file.h"
 #include "eina_private.h"
 /*============================================================================*
  *                                   API                                      * 
@@ -18,10 +21,8 @@ EAPI void eina_file_dir_list(const char *dir, int recursive, Eina_File_Dir_List_
 	if (!d)
 		return;
 
-	while (de = readdir(d))
+	while ((de = readdir(d)))
 	{
-		int length;
-
 		if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, ".."))
 			continue;
 		
@@ -64,7 +65,7 @@ EAPI void eina_file_path_nth_get(const char *path, int n, char **left, char **ri
 		inc = -1;
 		end = (char *)path;
 	}
-	for (tmp = p; tmp != end, num != n; tmp += inc)
+	for (tmp = p, delim = p; tmp != end && num != n; tmp += inc)
 	{
 		if (*tmp == '/')
 		{
diff --git a/legacy/eina/src/lib/eina_hash.c b/legacy/eina/src/lib/eina_hash.c
index b897ba4f55..dbf31ba13d 100644
--- a/legacy/eina/src/lib/eina_hash.c
+++ b/legacy/eina/src/lib/eina_hash.c
@@ -1,4 +1,6 @@
-#include "Eina.h"
+#include "eina_hash.h"
+#include "eina_inlist.h"
+#include "eina_error.h"
 #include "eina_private.h"
 /*============================================================================*
  *                                  Local                                     * 
@@ -94,12 +96,6 @@ eina_hash_add(Eina_Hash *hash, const char *key, const void *data)
 	el->data = (void *)data;
 	hash_num = _eina_hash_gen(key);
 	hash->buckets[hash_num] = eina_inlist_prepend(hash->buckets[hash_num], el);
-	if (eina_list_alloc_error())
-	{
-		_eina_hash_alloc_error = 1;
-		free(el);
-		return hash;
-	}
 	hash->population++;
 	return hash;
 }
@@ -157,12 +153,6 @@ eina_hash_direct_add(Eina_Hash *hash, const char *key, const void *data)
 	el->data = (void *)data;
 	hash_num = _eina_hash_gen(key);
 	hash->buckets[hash_num] = eina_inlist_prepend(hash->buckets[hash_num], el);
-	if (eina_list_alloc_error())
-	{
-		_eina_hash_alloc_error = 1;
-		free(el);
-		return hash;
-	}
 	hash->population++;
 	return hash;
 }
diff --git a/legacy/eina/src/lib/eina_inlist.c b/legacy/eina/src/lib/eina_inlist.c
index 582a714df4..dff33c8135 100644
--- a/legacy/eina/src/lib/eina_inlist.c
+++ b/legacy/eina/src/lib/eina_inlist.c
@@ -1,4 +1,4 @@
-#include "Eina.h"
+#include "eina_inlist.h"
 #include "eina_private.h"
 
 /* TODO please, refactor this :) */
diff --git a/legacy/eina/src/lib/eina_lalloc.c b/legacy/eina/src/lib/eina_lalloc.c
index f2ce80d442..f42a6dfd3e 100644
--- a/legacy/eina/src/lib/eina_lalloc.c
+++ b/legacy/eina/src/lib/eina_lalloc.c
@@ -1,4 +1,4 @@
-#include "Eina.h"
+#include "eina_lalloc.h"
 #include "eina_private.h"
 
 struct _Eina_Array
diff --git a/legacy/eina/src/lib/eina_list.c b/legacy/eina/src/lib/eina_list.c
index 0a5a627cef..0304862854 100644
--- a/legacy/eina/src/lib/eina_list.c
+++ b/legacy/eina/src/lib/eina_list.c
@@ -1,4 +1,4 @@
-#include "Eina.h"
+#include "eina_list.h"
 #include "eina_private.h"
 
 struct _Eina_List /** A linked list node */
diff --git a/legacy/eina/src/lib/eina_mempool.c b/legacy/eina/src/lib/eina_mempool.c
index 7d377e74e0..6a7681b99d 100644
--- a/legacy/eina/src/lib/eina_mempool.c
+++ b/legacy/eina/src/lib/eina_mempool.c
@@ -1,4 +1,6 @@
-#include "Eina.h"
+#include "eina_mempool.h"
+#include "eina_list.h"
+#include "eina_module.h"
 #include "eina_private.h"
 /*============================================================================*
  *                                  Local                                     * 
diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c
index 11f38fff0b..57759c9928 100644
--- a/legacy/eina/src/lib/eina_module.c
+++ b/legacy/eina/src/lib/eina_module.c
@@ -1,4 +1,5 @@
-#include "Eina.h"
+#include "eina_module.h"
+#include "eina_file.h"
 #include "eina_private.h"
 
 #include <dirent.h>