e_utils: change all E_API to EINTERN

Change-Id: I4ec9390f351fdddf604c5ab9874eae049f464fd2

diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index f472502..4559278 100644 (file)
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -23,14 +23,14 @@ static Ecore_Timer *_e_util_dummy_timer = NULL;
 static Eina_Hash *_e_file_monitor_hash = NULL;
 
 /* externally accessible functions */
-E_API void
+EINTERN void
 e_util_wakeup(void)
 {
    if (_e_util_dummy_timer) return;
    _e_util_dummy_timer = ecore_timer_add(0.0, _e_util_wakeup_cb, NULL);
 }
 
-E_API void
+EINTERN void
 e_util_env_set(const char *var, const char *val)
 {
    if (val)
@@ -73,7 +73,7 @@ e_util_env_get(const char *name)
    return strdup(val);
 }
 
-E_API int
+EINTERN int
 e_util_glob_match(const char *str, const char *pattern)
 {
    if ((!str) || (!pattern)) return 0;
@@ -88,7 +88,7 @@ e_util_glob_match(const char *str, const char *pattern)
    return 0;
 }
 
-E_API int
+EINTERN int
 e_util_glob_case_match(const char *str, const char *pattern)
 {
    const char *p;
@@ -124,7 +124,7 @@ e_util_strcmp(const char *s1, const char *s2)
    return 0x7fffffff;
 }
 
-E_API int
+EINTERN int
 e_util_strcasecmp(const char *s1, const char *s2)
 {
    if ((!s1) && (!s2)) return 0;
@@ -133,7 +133,7 @@ e_util_strcasecmp(const char *s1, const char *s2)
    return strcasecmp(s1, s2);
 }
 
-E_API int
+EINTERN int
 e_util_both_str_empty(const char *s1, const char *s2)
 {
    int empty = 0;
@@ -145,7 +145,7 @@ e_util_both_str_empty(const char *s1, const char *s2)
    return 0;
 }
 
-E_API unsigned int
+EINTERN unsigned int
 e_util_icon_size_normalize(unsigned int desired)
 {
    const unsigned int *itr, known_sizes[] =
@@ -160,7 +160,7 @@ e_util_icon_size_normalize(unsigned int desired)
    return 256; /* largest know size? */
 }
 
-E_API E_Client *
+EINTERN E_Client *
 e_util_desk_client_above(E_Client *ec)
 {
    E_Client *ec2;
@@ -175,7 +175,7 @@ e_util_desk_client_above(E_Client *ec)
    return NULL;
 }
 
-E_API E_Client *
+EINTERN E_Client *
 e_util_desk_client_below(E_Client *ec)
 {
    E_Client *ec2;
@@ -190,7 +190,7 @@ e_util_desk_client_below(E_Client *ec)
    return NULL;
 }
 
-E_API int
+EINTERN int
 e_util_edje_collection_exists(const char *file, const char *coll)
 {
    Eina_List *clist;
@@ -207,7 +207,7 @@ e_util_edje_collection_exists(const char *file, const char *coll)
    return ret;
 }
 
-E_API E_Dialog *
+EINTERN E_Dialog *
 e_util_dialog_internal(const char *title, const char *txt)
 {
    E_Dialog *dia;
@@ -224,7 +224,7 @@ e_util_dialog_internal(const char *title, const char *txt)
    return dia;
 }
 
-E_API const char *
+EINTERN const char *
 e_util_filename_escape(const char *filename)
 {
    const char *p;
@@ -364,7 +364,7 @@ e_util_shell_env_path_eval(const char *path)
 }
 #endif
 
-E_API char *
+EINTERN char *
 e_util_size_string_get(off_t size)
 {
    double dsize;
@@ -395,7 +395,7 @@ e_util_size_string_get(off_t size)
    return strdup(buf);
 }
 
-E_API char *
+EINTERN char *
 e_util_file_time_get(time_t ftime)
 {
    time_t diff, ltime, test;
@@ -450,13 +450,13 @@ e_util_file_time_get(time_t ftime)
    return s;
 }
 
-E_API Evas_Object *
+EINTERN Evas_Object *
 e_util_icon_add(const char *path, Evas *evas)
 {
    return _e_util_icon_add(path, evas, 64);
 }
 
-E_API Evas_Object *
+EINTERN Evas_Object *
 e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas)
 {
    if (!icon_name) return NULL;
@@ -464,7 +464,7 @@ e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas)
    return NULL;
 }
 
-E_API int
+EINTERN int
 e_util_dir_check(const char *dir)
 {
    if (!ecore_file_exists(dir))
@@ -486,7 +486,7 @@ e_util_dir_check(const char *dir)
    return 1;
 }
 
-E_API void
+EINTERN void
 e_util_defer_object_del(E_Object *obj)
 {
    if (stopping)
@@ -519,7 +519,7 @@ _win_auto_size_calc(int max, int min)
    return min;
 }
 
-E_API void
+EINTERN void
 e_util_win_auto_resize_fill(Evas_Object *win)
 {
    E_Zone *zone = NULL;
@@ -640,7 +640,7 @@ _e_util_conf_timer_new(void *data)
    return ECORE_CALLBACK_CANCEL;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_module_config_check(const char *module_name, int loaded, int current)
 {
    if (loaded > current)
@@ -661,7 +661,7 @@ e_util_module_config_check(const char *module_name, int loaded, int current)
 /**
  * Checks whenever the current manager/comp/zone have fullscreen windows.
  */
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_fullscreen_current_any(void)
 {
    E_Zone *zone = e_zone_current_get();
@@ -676,7 +676,7 @@ e_util_fullscreen_current_any(void)
 /**
  * Checks whenever any manager/comp/zone have fullscreen windows.
  */
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_fullscreen_any(void)
 {
    E_Zone *zone;
@@ -699,7 +699,7 @@ e_util_fullscreen_any(void)
    return EINA_FALSE;
 }
 
-E_API const char *
+EINTERN const char *
 e_util_time_str_get(long int seconds)
 {
    static char buf[1024];
@@ -789,7 +789,7 @@ _e_util_size_debug(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj
    fprintf(stderr, "%s %d OBJ[%s%s%p]: (%d,%d) - %dx%d\n", evas_object_visible_get(obj) ? "VIS" : "HID", evas_object_layer_get(obj), name ?: "", name ? "|" : "", obj, x, y, w, h);
 }
 
-E_API void
+EINTERN void
 e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable)
 {
    if (enable)
@@ -826,7 +826,7 @@ e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable)
      }
 }
 
-E_API void
+EINTERN void
 e_util_string_list_free(Eina_List *l)
 {
    char *s;
@@ -909,7 +909,7 @@ e_util_terminal_desktop_get(void)
 }
 #endif
 
-E_API char *
+EINTERN char *
 e_util_string_append_char(char *str, size_t *size, size_t *len, char c)
 {
    if (!str)
@@ -942,7 +942,7 @@ e_util_string_append_char(char *str, size_t *size, size_t *len, char c)
    return str;
 }
 
-E_API char *
+EINTERN char *
 e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src)
 {
    str = e_util_string_append_char(str, size, len, '\'');
@@ -976,7 +976,7 @@ e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *sr
    return str;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_string_to_uint(const char *str, unsigned int *num, int base)
 {
    char *end;
@@ -998,7 +998,7 @@ e_util_string_to_uint(const char *str, unsigned int *num, int base)
    return EINA_TRUE;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_string_to_int(const char *str, int *num, int base)
 {
    char *end;
@@ -1025,7 +1025,7 @@ e_util_string_to_int(const char *str, int *num, int base)
  * next: return values it contains the address of the first invalid character
  * num : return value it contains integer value according to the given base
  */
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_string_to_int_token(const char *str, char **next, int *num, int base)
 {
    int errsv;
@@ -1047,7 +1047,7 @@ e_util_string_to_int_token(const char *str, char **next, int *num, int base)
    return EINA_TRUE;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_string_to_double(const char *str, double *num)
 {
    char *end;
@@ -1068,7 +1068,7 @@ e_util_string_to_double(const char *str, double *num)
    return EINA_TRUE;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_string_to_ulong(const char *str, unsigned long *num, int base)
 {
    char *end;
@@ -1089,7 +1089,7 @@ e_util_string_to_ulong(const char *str, unsigned long *num, int base)
    return EINA_TRUE;
 }
 
-E_API void
+EINTERN void
 e_util_evas_objects_above_print(Evas_Object *o)
 {
    Evas_Object *a, *oo;
@@ -1112,7 +1112,7 @@ e_util_evas_objects_above_print(Evas_Object *o)
      }
 }
 
-E_API void
+EINTERN void
 e_util_evas_objects_above_print_smart(Evas_Object *o)
 {
    Evas_Object *a, *oo;
@@ -1155,13 +1155,13 @@ e_util_evas_objects_above_print_smart(Evas_Object *o)
  */
 static void *(* const volatile memset_ptr)(void *, int, size_t) = memset;
 
-E_API void
+EINTERN void
 e_util_memclear(void *s, size_t n)
 {
    memset_ptr(s, 0, n);
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_util_file_realpath_check(const char* path, Eina_Bool del_link)
 {
    char *real_path;
@@ -1259,7 +1259,7 @@ _e_util_file_monitor_hash_free(void *data)
    free(mon);
 }
 
-E_API void
+EINTERN void
 e_util_file_monitor_init(void)
 {
    E_EVENT_FILE_MONITOR_CREATED = ecore_event_type_new();
@@ -1268,7 +1268,7 @@ e_util_file_monitor_init(void)
      _e_file_monitor_hash = eina_hash_string_small_new(_e_util_file_monitor_hash_free);
 }
 
-E_API int
+EINTERN int
 e_util_file_monitor_shutdown(void)
 {
    E_EVENT_FILE_MONITOR_CREATED = -1;
@@ -1279,7 +1279,7 @@ e_util_file_monitor_shutdown(void)
    return 1;
 }
 
-E_API int
+EINTERN int
 e_util_file_monitor_add(const char *path, void *data)
 {
    char *dir_path = NULL;

diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index 7b094b5..1eb5976 100644 (file)
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -43,59 +43,60 @@ struct _E_Util_Event_File_Monitor
 #define P_(str, str_p, n) (str_p)
 #define N_(str) (str)
 
-E_API void         e_util_wakeup(void);
-E_API void         e_util_env_set(const char *var, const char *val);
+EINTERN void         e_util_wakeup(void);
+EINTERN void         e_util_env_set(const char *var, const char *val);
 E_API char        *e_util_env_get(const char *name);
-E_API int          e_util_glob_match(const char *str, const char *glob);
-E_API int          e_util_glob_case_match(const char *str, const char *glob);
-E_API int          e_util_strcasecmp(const char *s1, const char *s2);
+EINTERN int          e_util_glob_match(const char *str, const char *glob);
+EINTERN int          e_util_glob_case_match(const char *str, const char *glob);
+EINTERN int          e_util_strcasecmp(const char *s1, const char *s2);
 E_API int          e_util_strcmp(const char *s1, const char *s2);
-E_API int          e_util_both_str_empty(const char *s1, const char *s2);
-E_API unsigned int e_util_icon_size_normalize(unsigned int desired);
-E_API E_Client    *e_util_desk_client_above(E_Client *ec);
-E_API E_Client    *e_util_desk_client_below(E_Client *ec);
-E_API int          e_util_edje_collection_exists(const char *file, const char *coll);
-E_API E_Dialog     *e_util_dialog_internal(const char *title, const char *txt);
-E_API const char  *e_util_filename_escape(const char *filename);
+
+EINTERN int          e_util_both_str_empty(const char *s1, const char *s2);
+EINTERN unsigned int e_util_icon_size_normalize(unsigned int desired);
+EINTERN E_Client    *e_util_desk_client_above(E_Client *ec);
+EINTERN E_Client    *e_util_desk_client_below(E_Client *ec);
+EINTERN int          e_util_edje_collection_exists(const char *file, const char *coll);
+EINTERN E_Dialog     *e_util_dialog_internal(const char *title, const char *txt);
+EINTERN const char  *e_util_filename_escape(const char *filename);
 //E_API char        *e_util_shell_env_path_eval(const char *path);
-E_API char        *e_util_size_string_get(off_t size);
-E_API char        *e_util_file_time_get(time_t ftime);
-E_API Eina_Bool    e_util_file_realpath_check(const char* path, Eina_Bool del_link);
+EINTERN char        *e_util_size_string_get(off_t size);
+EINTERN char        *e_util_file_time_get(time_t ftime);
+EINTERN Eina_Bool    e_util_file_realpath_check(const char* path, Eina_Bool del_link);
 
-E_API Evas_Object *e_util_icon_add(const char *path, Evas *evas);
+EINTERN Evas_Object *e_util_icon_add(const char *path, Evas *evas);
 //E_API Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas);
-E_API Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas);
-E_API int          e_util_dir_check(const char *dir);
-E_API void         e_util_defer_object_del(E_Object *obj);
-E_API void         e_util_win_auto_resize_fill(Evas_Object *win);
+EINTERN Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas);
+EINTERN int          e_util_dir_check(const char *dir);
+EINTERN void         e_util_defer_object_del(E_Object *obj);
+EINTERN void         e_util_win_auto_resize_fill(Evas_Object *win);
 /* check if loaded config version matches the current version, show a
    dialog warning if loaded version is older or newer than current */
-E_API Eina_Bool    e_util_module_config_check(const char *module_name, int loaded, int current);
+EINTERN Eina_Bool    e_util_module_config_check(const char *module_name, int loaded, int current);
 
-E_API Eina_Bool e_util_fullscreen_current_any(void);
-E_API Eina_Bool e_util_fullscreen_any(void);
-E_API const char *e_util_time_str_get(long int seconds);
-E_API void e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable);
+EINTERN Eina_Bool e_util_fullscreen_current_any(void);
+EINTERN Eina_Bool e_util_fullscreen_any(void);
+EINTERN const char *e_util_time_str_get(long int seconds);
+EINTERN void e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable);
 //E_API Efreet_Desktop *e_util_terminal_desktop_get(void);
 
-E_API char *e_util_string_append_char(char *str, size_t *size, size_t *len, char c);
-E_API char *e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);
-E_API Eina_Bool e_util_string_to_uint(const char *str, unsigned int *num, int base);
-E_API Eina_Bool e_util_string_to_int(const char *str, int *num, int base);
-E_API Eina_Bool e_util_string_to_int_token(const char *str, char **next, int *num, int base);
-E_API Eina_Bool e_util_string_to_double(const char *str, double *num);
-E_API Eina_Bool e_util_string_to_ulong(const char *str, unsigned long *num, int base);
+EINTERN char *e_util_string_append_char(char *str, size_t *size, size_t *len, char c);
+EINTERN char *e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);
+EINTERN Eina_Bool e_util_string_to_uint(const char *str, unsigned int *num, int base);
+EINTERN Eina_Bool e_util_string_to_int(const char *str, int *num, int base);
+EINTERN Eina_Bool e_util_string_to_int_token(const char *str, char **next, int *num, int base);
+EINTERN Eina_Bool e_util_string_to_double(const char *str, double *num);
+EINTERN Eina_Bool e_util_string_to_ulong(const char *str, unsigned long *num, int base);
 
-E_API void e_util_evas_objects_above_print(Evas_Object *o);
-E_API void e_util_evas_objects_above_print_smart(Evas_Object *o);
+EINTERN void e_util_evas_objects_above_print(Evas_Object *o);
+EINTERN void e_util_evas_objects_above_print_smart(Evas_Object *o);
 
-E_API void e_util_string_list_free(Eina_List *l);
+EINTERN void e_util_string_list_free(Eina_List *l);
 
-E_API void e_util_memclear(void *s, size_t n);
+EINTERN void e_util_memclear(void *s, size_t n);
 
-E_API void e_util_file_monitor_init(void);
-E_API int e_util_file_monitor_shutdown(void);
-E_API int e_util_file_monitor_add(const char *path, void *data);
+EINTERN void e_util_file_monitor_init(void);
+EINTERN int e_util_file_monitor_shutdown(void);
+EINTERN int e_util_file_monitor_add(const char *path, void *data);
 
 E_API unsigned int e_util_timestamp_get(void);