e_utils: remove extern variable

for reducing the global variables

Change-Id: Id023cf322856b3c9628ef53e22d286f16366eeab

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 7ff3e7d4d2d875986ce5ed805d2477ff6faea6d8..d9b1a30ee54e666e9d703ad564bf8e429101b729 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -120,6 +120,13 @@ static Eina_Bool _e_main_cb_idle_after(void *data EINA_UNUSED);
 static void      _e_main_hooks_clean(void);
 static void      _e_main_hook_call(E_Main_Hook_Point hookpoint, void *data EINA_UNUSED);
 
+static E_Path *path_data;
+static E_Path *path_images;
+static E_Path *path_fonts;
+static E_Path *path_icons;
+static E_Path *path_backgrounds;
+static E_Path *path_messages;
+
 /* local variables */
 static int _e_main_lvl = 0;
 static int(*_e_main_shutdown_func[MAX_LEVEL]) (void);

diff --git a/src/bin/utils/e_utils.c b/src/bin/utils/e_utils.c
index 97e236a3c2234a867ffac75daf5aec1221215533..9b70ddb43cbbdbec76a27456d2daeb6f5ee53df6 100644 (file)
--- a/src/bin/utils/e_utils.c
+++ b/src/bin/utils/e_utils.c
@@ -5,13 +5,7 @@
 #include <ctype.h>
 #include <fnmatch.h>
 
-EINTERN E_Path * path_data = NULL;
-EINTERN E_Path * path_images = NULL;
-EINTERN E_Path * path_fonts = NULL;
-EINTERN E_Path * path_icons = NULL;
 EINTERN E_Path * path_modules = NULL;
-EINTERN E_Path * path_backgrounds = NULL;
-EINTERN E_Path * path_messages = NULL;
 
 EINTERN int E_EVENT_FILE_MONITOR_CREATED = -1;
 

diff --git a/src/bin/utils/e_utils_intern.h b/src/bin/utils/e_utils_intern.h
index a052b4ea7a1546f737f50313a24e575f2c33cf88..07cc5b2ee7543dcd9ee29641dc69526b7c89ff5b 100644 (file)
--- a/src/bin/utils/e_utils_intern.h
+++ b/src/bin/utils/e_utils_intern.h
@@ -11,14 +11,8 @@
 #define E_UTIL_SENSORD_READY_PATH "/run/enlightenment/sensord_ready"
 
 extern EINTERN int E_EVENT_FILE_MONITOR_CREATED;
-extern EINTERN E_Path *path_data;
-extern EINTERN E_Path *path_images;
-extern EINTERN E_Path *path_fonts;
-extern EINTERN E_Path *path_themes;
-extern EINTERN E_Path *path_icons;
+
 extern EINTERN E_Path *path_modules;
-extern EINTERN E_Path *path_backgrounds;
-extern EINTERN E_Path *path_messages;
 
 typedef struct _E_Util_File_Monitor E_Util_File_Monitor;
 typedef struct _E_Util_Event_File_Monitor E_Util_Event_File_Monitor;