diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c index 2120851af5..7da699f75a 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c @@ -1,8 +1,3 @@ -#include "Ecore_Config.h" -#include "config.h" -#include "ecore_config_private.h" -#include "ecore_config_ipc.h" - #include #include #include @@ -14,13 +9,19 @@ #include #include #include + +#include "Ecore_Config.h" +#include "config.h" +#include "ecore_config_private.h" +#include "ecore_config_ipc.h" + #include "ecore_config_util.h" int DEBUG = 0; -Ecore_Config_Server *__ecore_config_server_global = NULL; -Ecore_Config_Server *__ecore_config_server_local = NULL; -Ecore_Config_Bundle *__ecore_config_bundle_local = NULL; -char *__ecore_config_app_name = NULL; +EAPI Ecore_Config_Server *__ecore_config_server_global = NULL; +EAPI Ecore_Config_Server *__ecore_config_server_local = NULL; +EAPI Ecore_Config_Bundle *__ecore_config_bundle_local = NULL; +EAPI char *__ecore_config_app_name = NULL; int __ecore_config_system_init = 0; static int _ecore_config_system_init_no_load(void); @@ -41,7 +42,7 @@ static const char *_ecore_config_type[] = * @return @c NULL * @ingroup Ecore_Config_Property_Group */ -Ecore_Config_Prop * +EAPI Ecore_Config_Prop * ecore_config_dst(Ecore_Config_Prop * e) { Ecore_Config_Bundle *t; @@ -102,7 +103,7 @@ ecore_config_dst(Ecore_Config_Prop * e) * key could not be found. * @ingroup Ecore_Config_Get_Group */ -Ecore_Config_Prop * +EAPI Ecore_Config_Prop * ecore_config_get(const char *key) { Ecore_Config_Bundle *t; @@ -128,7 +129,7 @@ ecore_config_get(const char *key) * string "not found" is returned. * @ingroup Ecore_Config_Property_Group */ -const char * +EAPI const char * ecore_config_type_get(const Ecore_Config_Prop * e) { if (e) @@ -144,7 +145,7 @@ ecore_config_type_get(const Ecore_Config_Prop * e) * @return Data pointer used by the property. * @ingroup Ecore_Config_Get_Group */ -void * +EAPI void * ecore_config_data_get(const char *key) { Ecore_Config_Prop *e; @@ -161,7 +162,7 @@ ecore_config_data_get(const char *key) * the property is not a string or is not set. * @ingroup Ecore_Config_Get_Group */ -char * +EAPI char * ecore_config_string_get(const char *key) { return _ecore_config_string_get( ecore_config_get(key) ); @@ -180,7 +181,7 @@ _ecore_config_string_get(Ecore_Config_Prop *e) * property is not an integer or is not set. * @ingroup Ecore_Config_Get_Group */ -int +EAPI int ecore_config_boolean_get(const char *key) { return _ecore_config_boolean_get( ecore_config_get(key) ); @@ -199,13 +200,13 @@ _ecore_config_boolean_get(Ecore_Config_Prop *e) * property is not an integer or is not set. * @ingroup Ecore_Config_Get_Group */ -long +EAPI long ecore_config_int_get(const char *key) { return _ecore_config_int_get( ecore_config_get(key) ); } -long +EAPI long _ecore_config_int_get(Ecore_Config_Prop *e) { return (e && ((e->type == ECORE_CONFIG_INT) || (e->type == ECORE_CONFIG_RGB))) ? e->val : 0L; @@ -218,13 +219,13 @@ _ecore_config_int_get(Ecore_Config_Prop *e) * property is not a float or is not set. * @ingroup Ecore_Config_Get_Group */ -float +EAPI float ecore_config_float_get(const char *key) { return _ecore_config_float_get( ecore_config_get(key) ); } -float +EAPI float _ecore_config_float_get(Ecore_Config_Prop *e) { return (e && (e->type == ECORE_CONFIG_FLT)) ? ((float)e->val / ECORE_CONFIG_FLOAT_PRECISION) : 0.0; @@ -241,7 +242,7 @@ _ecore_config_float_get(Ecore_Config_Prop *e) * @ingroup Ecore_Config_Get_Group * @deprecated */ -int +EAPI int ecore_config_rgb_get(const char *key, int *r, int *g, int *b) { return _ecore_config_argb_get( ecore_config_get(key), NULL, r, g, b); @@ -258,13 +259,13 @@ ecore_config_rgb_get(const char *key, int *r, int *g, int *b) * otherwise. * @ingroup Ecore_Config_Get_Group */ -int +EAPI int ecore_config_argb_get(const char *key, int *a, int *r, int *g, int *b) { return _ecore_config_argb_get( ecore_config_get(key), a, r, g, b); } -int +EAPI int _ecore_config_argb_get(Ecore_Config_Prop *e, int *a, int *r, int *g, int *b) { if (e && ((e->type == ECORE_CONFIG_RGB))) @@ -285,7 +286,7 @@ _ecore_config_argb_get(Ecore_Config_Prop *e, int *a, int *r, int *g, int *b) * @ingroup Ecore_Config_Get_Group * @deprecated */ -char * +EAPI char * ecore_config_rgbstr_get(const char *key) { char *argb, *rgb; @@ -302,7 +303,7 @@ ecore_config_rgbstr_get(const char *key) * @return A string of hexadecimal characters in the format #aarrggbb. * @ingroup Ecore_Config_Get_Group */ -char * +EAPI char * ecore_config_argbstr_get(const char *key) { return _ecore_config_argbstr_get( ecore_config_get(key) ); @@ -325,7 +326,7 @@ _ecore_config_argbstr_get(Ecore_Config_Prop *e) * @c NULL if the property is not a theme or is not set. * @ingroup Ecore_Config_Get_Group */ -char * +EAPI char * ecore_config_theme_get(const char *key) { return _ecore_config_theme_get( ecore_config_get(key) ); @@ -344,7 +345,7 @@ _ecore_config_theme_get(Ecore_Config_Prop *e) * is returned if the property does not exist. * @ingroup Ecore_Config_Get_Group */ -char * +EAPI char * ecore_config_as_string_get(const char *key) { Ecore_Config_Prop *e; @@ -393,7 +394,7 @@ ecore_config_as_string_get(const char *key) return r; } -int +EAPI int ecore_config_bound(Ecore_Config_Prop * e) { int ret; @@ -460,7 +461,7 @@ ecore_config_bound(Ecore_Config_Prop * e) * @return The type of the property determined by the function. Note that if * val is @c NULL, @c ECORE_CONFIG_NIL will be returned. */ -int +EAPI int ecore_config_type_guess(const char *key, const char *val) { Ecore_Config_Prop *p; @@ -627,7 +628,7 @@ ecore_config_add(const char *key, const char *val) * free @p desc once this function is called. * @ingroup Ecore_Config_Property_Group */ -int +EAPI int ecore_config_describe(const char *key, char *desc) { Ecore_Config_Prop *e; @@ -647,7 +648,7 @@ ecore_config_describe(const char *key, char *desc) * is returned if the property does not exist. * @ingroup Ecore_Config_Property_Group */ -int +EAPI int ecore_config_short_opt_set(const char *key, char short_opt) { Ecore_Config_Prop *e; @@ -667,7 +668,7 @@ ecore_config_short_opt_set(const char *key, char short_opt) * is returned if the property does not exist. * @ingroup Ecore_Config_Property_Group */ -int +EAPI int ecore_config_long_opt_set(const char *key, char *long_opt) { Ecore_Config_Prop *e; @@ -689,7 +690,7 @@ ecore_config_long_opt_set(const char *key, char *long_opt) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Property_Group */ -int +EAPI int ecore_config_typed_set(const char *key, const void *val, int type) { Ecore_Config_Prop *e; @@ -737,7 +738,7 @@ ecore_config_typed_set(const char *key, const void *val, int type) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_set(const char *key, char *val) { int type; @@ -766,7 +767,7 @@ ecore_config_set(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_as_string_set(const char *key, char *val) { return ecore_config_set(key, val); @@ -779,7 +780,7 @@ ecore_config_as_string_set(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_boolean_set(const char *key, int val) { val = val ? 1 : 0; @@ -793,7 +794,7 @@ ecore_config_boolean_set(const char *key, int val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_int_set(const char *key, int val) { return ecore_config_typed_set(key, (void *)&val, ECORE_CONFIG_INT); @@ -806,7 +807,7 @@ ecore_config_int_set(const char *key, int val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_string_set(const char *key, char *val) { return ecore_config_typed_set(key, (void *)val, ECORE_CONFIG_STR); @@ -819,13 +820,13 @@ ecore_config_string_set(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_float_set(const char *key, float val) { return ecore_config_typed_set(key, (void *)&val, ECORE_CONFIG_FLT); } -char * +EAPI char * ecore_config_rgb_to_argb(char *rgb) { char *argb; @@ -844,7 +845,7 @@ ecore_config_rgb_to_argb(char *rgb) * @ingroup Ecore_Config_Set_Group * @deprecated */ -int +EAPI int ecore_config_rgb_set(const char *key, char *val) { char *argb; @@ -863,7 +864,7 @@ ecore_config_rgb_set(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_argb_set(const char *key, char *val) { return ecore_config_typed_set(key, (void *)val, ECORE_CONFIG_RGB); @@ -876,7 +877,7 @@ ecore_config_argb_set(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_theme_set(const char *key, char *val) { return ecore_config_typed_set(key, (void *)val, ECORE_CONFIG_THM); @@ -889,7 +890,7 @@ ecore_config_theme_set(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC on success. * @ingroup Ecore_Config_Set_Group */ -int +EAPI int ecore_config_theme_preview_group_set(const char *key, char *group) { int ret; @@ -910,7 +911,7 @@ ecore_config_theme_preview_group_set(const char *key, char *group) return ret; } -int +EAPI int ecore_config_typed_default(const char *key, void *val, int type) { int ret; @@ -954,7 +955,7 @@ ecore_config_typed_default(const char *key, void *val, int type) * integer and float properties. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_default(const char *key, char *val, float lo, float hi, float step) { int ret, type; @@ -994,7 +995,7 @@ ecore_config_default(const char *key, char *val, float lo, float hi, float step) * @return @c ECORE_CONFIG_ERR_SUCC if there are no problems. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_boolean_default(const char *key, int val) { val = val ? 1 : 0; @@ -1009,7 +1010,7 @@ ecore_config_boolean_default(const char *key, int val) * @return @c ECORE_CONFIG_ERR_SUCC if there are no problems. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_int_default(const char *key, int val) { return ecore_config_typed_default(key, (void *)&val, ECORE_CONFIG_INT); @@ -1029,7 +1030,7 @@ ecore_config_int_default(const char *key, int val) * @return @c ECORE_CONFIG_ERR_SUCC if there were no problems. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_int_default_bound(const char *key, int val, int low, int high, int step) { @@ -1058,7 +1059,7 @@ ecore_config_int_default_bound(const char *key, int val, int low, int high, * @return @c ECORE_CONFIG_ERR_SUCC if there were no problems. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_string_default(const char *key, const char *val) { return ecore_config_typed_default(key, (void *)val, ECORE_CONFIG_STR); @@ -1072,7 +1073,7 @@ ecore_config_string_default(const char *key, const char *val) * @return @c ECORE_CONFIG_ERR_SUCC if there were no problems. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_float_default(const char *key, float val) { return ecore_config_typed_default(key, (void *)&val, ECORE_CONFIG_FLT); @@ -1092,7 +1093,7 @@ ecore_config_float_default(const char *key, float val) * @return @c ECORE_CONFIG_ERR_SUCC if there were no problems. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_float_default_bound(const char *key, float val, float low, float high, float step) { @@ -1122,7 +1123,7 @@ ecore_config_float_default_bound(const char *key, float val, float low, * @ingroup Ecore_Config_Default_Group * @deprecated */ -int +EAPI int ecore_config_rgb_default(const char *key, char *val) { char *argb; @@ -1142,7 +1143,7 @@ ecore_config_rgb_default(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if there are no problems. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_argb_default(const char *key, char *val) { return ecore_config_typed_default(key, (void *)val, ECORE_CONFIG_RGB); @@ -1156,7 +1157,7 @@ ecore_config_argb_default(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if the property is set successfully. * @ingroup Ecore_Config_Default_Group */ -int +EAPI int ecore_config_theme_default(const char *key, char *val) { return ecore_config_typed_default(key, (void *)val, ECORE_CONFIG_THM); @@ -1179,7 +1180,7 @@ ecore_config_theme_default(const char *key, char *val) * @return @c ECORE_CONFIG_ERR_SUCC if successful in setting up the callback. * @ingroup Ecore_Config_Listeners_Group */ -int +EAPI int ecore_config_listen(const char *name, const char *key, Ecore_Config_Listener listener, int tag, void *data) { @@ -1246,7 +1247,7 @@ ecore_config_listen(const char *name, const char *key, * for the key pointer, @c ECORE_CONFIG_ERR_NODATA is returned. * @ingroup Ecore_Config_Listeners_Group */ -int +EAPI int ecore_config_deaf(const char *name, const char *key, Ecore_Config_Listener listener) { @@ -1288,7 +1289,7 @@ ecore_config_deaf(const char *name, const char *key, * @param srv The configuration server. * @return Pointer to the first configuration bundle. */ -Ecore_Config_Bundle * +EAPI Ecore_Config_Bundle * ecore_config_bundle_1st_get(Ecore_Config_Server * srv) { /* anchor: global, but read-only */ return srv->bundles; @@ -1299,7 +1300,7 @@ ecore_config_bundle_1st_get(Ecore_Config_Server * srv) * @param ns The configuration bundle. * @return The next configuration bundle. */ -Ecore_Config_Bundle * +EAPI Ecore_Config_Bundle * ecore_config_bundle_next_get(Ecore_Config_Bundle * ns) { return ns ? ns->next : NULL; @@ -1312,7 +1313,7 @@ ecore_config_bundle_next_get(Ecore_Config_Bundle * ns) * @param serial Serial number. * @return The configuration bundle with the given serial number. */ -Ecore_Config_Bundle * +EAPI Ecore_Config_Bundle * ecore_config_bundle_by_serial_get(Ecore_Config_Server * srv, long serial) { Ecore_Config_Bundle *eb; @@ -1345,7 +1346,7 @@ ecore_config_bundle_by_serial_get(Ecore_Config_Server * srv, long serial) * @return The bundle with the given identifier string, or @c NULL if it * could not be found. */ -Ecore_Config_Bundle * +EAPI Ecore_Config_Bundle * ecore_config_bundle_by_label_get(Ecore_Config_Server * srv, const char *label) { Ecore_Config_Bundle *ns; @@ -1366,7 +1367,7 @@ ecore_config_bundle_by_label_get(Ecore_Config_Server * srv, const char *label) * @param ns The configuration bundle. * @return The bundle's identifier string, or -1 if ns is @c NULL. */ -long +EAPI long ecore_config_bundle_serial_get(Ecore_Config_Bundle * ns) { return ns ? ns->serial : -1; @@ -1377,7 +1378,7 @@ ecore_config_bundle_serial_get(Ecore_Config_Bundle * ns) * @param ns The configuration bundle. * @return The bundle's identifer string. */ -char * +EAPI char * ecore_config_bundle_label_get(Ecore_Config_Bundle * ns) { return ns ? ns->identifier : NULL; @@ -1390,7 +1391,7 @@ ecore_config_bundle_label_get(Ecore_Config_Bundle * ns) * @return A pointer to a new Ecore_Config_Bundle. @c NULL is returned if the * structure couldn't be allocated. */ -Ecore_Config_Bundle * +EAPI Ecore_Config_Bundle * ecore_config_bundle_new(Ecore_Config_Server * srv, const char *identifier) { Ecore_Config_Bundle *t; @@ -1480,7 +1481,7 @@ ecore_config_init_global(const char *name) * @c ECORE_CONFIG_ERR_FAIL otherwise. * @ingroup Ecore_Config_App_Lib_Group */ -int +EAPI int ecore_config_init(const char *name) { char *path; @@ -1520,7 +1521,7 @@ ecore_config_init(const char *name) * @return @c ECORE_CONFIG_ERR_IGNORED . * @ingroup Ecore_Config_App_Lib_Group */ -int +EAPI int ecore_config_shutdown(void) { return ecore_config_system_shutdown(); @@ -1547,7 +1548,7 @@ ecore_config_shutdown(void) * @c ECORE_CONFIG_ERR_FAIL otherwise. * @ingroup Ecore_Config_Lib_Lib_Group */ -int +EAPI int ecore_config_system_init(void) { _ecore_config_system_init_no_load(); @@ -1626,7 +1627,7 @@ _ecore_config_system_load(void) * @return @c ECORE_CONFIG_ERR_IGNORED * @ingroup Ecore_Config_Lib_Lib_Group */ -int +EAPI int ecore_config_system_shutdown(void) { int ret; diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_db.c b/legacy/ecore/src/lib/ecore_config/ecore_config_db.c index 68903ae593..ade415c404 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_db.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_db.c @@ -1,8 +1,3 @@ -#include "Ecore_Config.h" -#include "ecore_config_private.h" -#include "ecore_config_util.h" -#include - #include #include #include @@ -14,6 +9,11 @@ #include #include +#include "Ecore_Config.h" +#include "ecore_config_private.h" +#include "ecore_config_util.h" +#include + struct _Ecore_Config_DB_File { Eet_File *ef; diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c index 7370719e41..81d286fee6 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c @@ -1,8 +1,3 @@ -#include "Ecore_Config.h" -#include "Ecore.h" - -#include "config.h" - #include #include #include @@ -10,6 +5,11 @@ #include #include +#include "Ecore_Config.h" +#include "Ecore.h" + +#include "config.h" + typedef struct __Ecore_Config_Arg_Callback _Ecore_Config_Arg_Callback; struct __Ecore_Config_Arg_Callback { diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c index 6cc93f6d16..ab27fefe10 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c @@ -1,9 +1,4 @@ /* by Azundris, with thanks to Corey Donohoe */ -#include "ecore_private.h" -#include "ecore_config_ipc.h" -#include "ecore_config_util.h" -#include "ecore_config_private.h" - #include #include #include @@ -17,6 +12,11 @@ #include #include +#include "ecore_private.h" +#include "ecore_config_ipc.h" +#include "ecore_config_util.h" +#include "ecore_config_private.h" + #include "Ecore_Config.h" #include "config.h" diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c index f6c3a39d97..7835437def 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c @@ -1,14 +1,6 @@ /* ############## bad */ #define HAVE_EVAS2 -#include "Ecore.h" -#include "Ecore_Config.h" -#include "ecore_config_util.h" -#include "ecore_config_ipc.h" - -#include "config.h" -#include "ecore_config_private.h" - #include #include #include @@ -18,6 +10,14 @@ #include #include /* malloc(), free() */ +#include "Ecore.h" +#include "Ecore_Config.h" +#include "ecore_config_util.h" +#include "ecore_config_ipc.h" + +#include "config.h" +#include "ecore_config_private.h" + static Ecore_Config_Server *__ecore_config_servers; Ecore_Timer *ipc_timer = NULL; diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_private.h b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h index 238fa8c0ee..e8eb88530e 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_private.h +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h @@ -34,4 +34,6 @@ char *_ecore_config_argbstr_get(Ecore_Config_Prop *e); float _ecore_config_float_get(Ecore_Config_Prop *e); char *_ecore_config_theme_get(Ecore_Config_Prop *e); +#include "ecore_private.h" + #endif diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c index 827b152e8d..104dd18945 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c @@ -1,6 +1,3 @@ -#include "Ecore_Config.h" -#include "ecore_config_private.h" - #include #include #include @@ -11,13 +8,16 @@ #include #include +#include "Ecore_Config.h" +#include "ecore_config_private.h" + /** * Loads the default configuration. * @return @c ECORE_CONFIG_ERR_SUCC on success. @c ECORE_CONFIG_ERR_NODATA * is returned if the file cannot be loaded. * @ingroup Ecore_Config_File_Group */ -int +EAPI int ecore_config_load(void) { char file[PATH_MAX]; @@ -37,7 +37,7 @@ ecore_config_load(void) * saved. * @ingroup Ecore_Config_File_Group */ -int +EAPI int ecore_config_save(void) { char file[PATH_MAX]; @@ -57,7 +57,7 @@ ecore_config_save(void) * is returned if the file cannot be loaded. * @ingroup Ecore_Config_File_Group */ -int +EAPI int ecore_config_file_load(const char *file) { Ecore_Config_DB_File *db; @@ -129,7 +129,7 @@ _ecore_config_recurse_mkdir(const char *file) * saved. * @ingroup Ecore_Config_File_Group */ -int +EAPI int ecore_config_file_save(const char *file) { Ecore_Config_Prop *next; diff --git a/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c b/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c index 11227291b7..d019fe585c 100644 --- a/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c +++ b/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c @@ -45,9 +45,9 @@ /* global variables */ -int ECORE_DBUS_EVENT_SERVER_ADD = 0; -int ECORE_DBUS_EVENT_SERVER_DEL = 0; -int ECORE_DBUS_EVENT_SERVER_DATA = 0; +EAPI int ECORE_DBUS_EVENT_SERVER_ADD = 0; +EAPI int ECORE_DBUS_EVENT_SERVER_DEL = 0; +EAPI int ECORE_DBUS_EVENT_SERVER_DATA = 0; /* private function declaration */ @@ -58,7 +58,7 @@ static void _ecore_dbus_message_increase_length(unsigned char **buf, un static void _ecore_dbus_message_4byte_padding(unsigned char **buf, unsigned int *old_length); static void _ecore_dbus_message_8byte_padding(unsigned char **buf, unsigned int *old_length); static void _ecore_dbus_message_skip_4byte_padding(unsigned int *old_length); -static void _ecore_dbus_message_skip_8byte_padding(unsigned int *old_length); +/*static void _ecore_dbus_message_skip_8byte_padding(unsigned int *old_length);*/ /* appending/reading functions */ static void _ecore_dbus_message_append_nbytes(unsigned char *buf, unsigned char *data, unsigned int data_length); static void _ecore_dbus_message_append_byte(unsigned char *buf, unsigned char c); @@ -141,8 +141,8 @@ static int _ecore_dbus_event_server_data(void *data, int ev_type, void /* printing functions */ static Ecore_DBus_Message_Field *_ecore_dbus_message_print_field(Ecore_DBus_Message_Field *f, unsigned char *buf); static Ecore_DBus_Message_Field *_ecore_dbus_message_print_header_field(Ecore_DBus_Message_Field *f, unsigned char *buf); -static void _ecore_dbus_message_print_fields(Ecore_DBus_Message_Field *f); -static void _ecore_dbus_message_print_raw(unsigned char *msg, unsigned int msg_len); +/*static void _ecore_dbus_message_print_fields(Ecore_DBus_Message_Field *f);*/ +/*static void _ecore_dbus_message_print_raw(unsigned char *msg, unsigned int msg_len);*/ /* local variables */ @@ -159,7 +159,7 @@ static Ecore_List2 *servers = NULL; static Ecore_Event_Handler *handler[3]; /* public functions */ -int +EAPI int ecore_dbus_init(void) { int i = 0; @@ -182,7 +182,7 @@ ecore_dbus_init(void) return init_count; } -int +EAPI int ecore_dbus_shutdown(void) { int i = 0; @@ -197,7 +197,7 @@ ecore_dbus_shutdown(void) return init_count; } -Ecore_DBus_Server * +EAPI Ecore_DBus_Server * ecore_dbus_server_connect(Ecore_DBus_Type compl_type, char *name, int port, const void *data) { @@ -237,7 +237,7 @@ ecore_dbus_server_connect(Ecore_DBus_Type compl_type, char *name, int port, return svr; } -void +EAPI void ecore_dbus_server_del(Ecore_DBus_Server *svr) { if (svr->server) ecore_con_server_del(svr->server); @@ -245,7 +245,7 @@ ecore_dbus_server_del(Ecore_DBus_Server *svr) free(svr); } -int +EAPI int ecore_dbus_server_send(Ecore_DBus_Server *svr, char *command, int length) { int ret; @@ -256,7 +256,7 @@ ecore_dbus_server_send(Ecore_DBus_Server *svr, char *command, int length) return ret; } -unsigned int +EAPI unsigned int ecore_dbus_message_new_method_call(Ecore_DBus_Server *svr, char *service, char *path, char *interface, char *method, char *fmt, ...) @@ -374,7 +374,7 @@ ecore_dbus_message_new_method_call(Ecore_DBus_Server *svr, char *service, return serial; } -void +EAPI void ecore_dbus_message_print(Ecore_DBus_Message *msg) { Ecore_DBus_Message_Field *f; @@ -410,7 +410,7 @@ ecore_dbus_message_print(Ecore_DBus_Message *msg) printf("[ecore_dbus] end per field message\n"); } -void * +EAPI void * ecore_dbus_get_header_field(Ecore_DBus_Message *m, Ecore_DBus_Message_Field *mf, Ecore_DBus_Message_Header_Field hft) @@ -423,7 +423,7 @@ ecore_dbus_get_header_field(Ecore_DBus_Message *m, return NULL; } -void * +EAPI void * ecore_dbus_get_body_field(Ecore_DBus_Message *m, Ecore_DBus_Message_Field *mf, unsigned int pos) { @@ -499,7 +499,8 @@ _ecore_dbus_message_skip_4byte_padding(unsigned int *old_length) return; } -static void + +/*static void _ecore_dbus_message_skip_8byte_padding(unsigned int *old_length) { unsigned int padding; @@ -509,6 +510,7 @@ _ecore_dbus_message_skip_8byte_padding(unsigned int *old_length) *old_length += 8 - padding; return; } +*/ /* appending/reading functions */ @@ -1267,6 +1269,7 @@ _ecore_dbus_message_print_header_field(Ecore_DBus_Message_Field *f, unsigned cha return _ecore_dbus_message_print_field(f, buf); } +/* static void _ecore_dbus_message_print_fields(Ecore_DBus_Message_Field *f) { @@ -1301,4 +1304,4 @@ _ecore_dbus_message_print_raw(unsigned char *msg, unsigned int msg_len) printf("\n"); printf("[ecore_dbus] end raw message\n"); } - +*/ diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb.c index c22320a551..659b5f578c 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb.c @@ -90,12 +90,12 @@ static void _ecore_fb_event_free_key_down(void *data, void *ev); static void _ecore_fb_event_free_key_up(void *data, void *ev); static int _ecore_fb_signal_usr_handler(void *data, int type, void *ev); static void _ecore_fb_vt_switch(int vt); - -int ECORE_FB_EVENT_KEY_DOWN = 0; -int ECORE_FB_EVENT_KEY_UP = 0; -int ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = 0; -int ECORE_FB_EVENT_MOUSE_BUTTON_UP = 0; -int ECORE_FB_EVENT_MOUSE_MOVE = 0; + +EAPI int ECORE_FB_EVENT_KEY_DOWN = 0; +EAPI int ECORE_FB_EVENT_KEY_UP = 0; +EAPI int ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = 0; +EAPI int ECORE_FB_EVENT_MOUSE_BUTTON_UP = 0; +EAPI int ECORE_FB_EVENT_MOUSE_MOVE = 0; static Ecore_Event_Handler *_ecore_fb_user_handler = NULL; static Ecore_Event_Filter *_ecore_fb_filter_handler = NULL; @@ -270,7 +270,7 @@ static const char *_ecore_fb_btn_syms[128] = * been initialised without being shut down. * @ingroup Ecore_FB_Library_Group */ -int +EAPI int ecore_fb_init(const char *name __UNUSED__) { int prev_flags; @@ -433,7 +433,7 @@ ecore_fb_init(const char *name __UNUSED__) * being shut down. * @ingroup Ecore_FB_Library_Group */ -int +EAPI int ecore_fb_shutdown(void) { _ecore_fb_init_count--; @@ -491,7 +491,7 @@ ecore_fb_shutdown(void) * @param t The time in seconds * @ingroup Ecore_FB_Click_Group */ -void +EAPI void ecore_fb_double_click_time_set(double t) { if (t < 0.0) t = 0.0; @@ -506,7 +506,7 @@ ecore_fb_double_click_time_set(double t) * @return The timeout for double clicks in seconds. * @ingroup Ecore_FB_Click_Group */ -double +EAPI double ecore_fb_double_click_time_get(void) { return _ecore_fb_double_click_time; @@ -517,7 +517,7 @@ ecore_fb_double_click_time_get(void) * @param w Pointer to an integer in which to store the width. * @param h Pointer to an interge in which to store the height. */ -void +EAPI void ecore_fb_size_get(int *w, int *h) { if (w) *w = _ecore_fb_console_w; @@ -539,7 +539,7 @@ ecore_fb_size_get(int *w, int *h) * @param xyswap Swap X & Y flag. * @ingroup Ecore_FB_Calibrate_Group */ -void +EAPI void ecore_fb_touch_screen_calibrate_set(int xscale, int xtrans, int yscale, int ytrans, int xyswap) { Ecore_Fb_Ts_Calibrate cal; @@ -567,7 +567,7 @@ ecore_fb_touch_screen_calibrate_set(int xscale, int xtrans, int yscale, int ytra * @param xyswap Pointer to an integer in which to store the Swap X & Y flag. * @ingroup Ecore_FB_Calibrate_Group */ -void +EAPI void ecore_fb_touch_screen_calibrate_get(int *xscale, int *xtrans, int *yscale, int *ytrans, int *xyswap) { Ecore_Fb_Ts_Calibrate cal; @@ -598,7 +598,7 @@ ecore_fb_touch_screen_calibrate_get(int *xscale, int *xtrans, int *yscale, int * * @param on @c 1 to turn the backlight on. @c 0 to turn it off. * @ingroup Ecore_FB_Backlight_Group */ -void +EAPI void ecore_fb_backlight_set(int on) { Ecore_Fb_Ts_Backlight bl; @@ -614,7 +614,7 @@ ecore_fb_backlight_set(int on) * @return Whether the backlight is on. * @ingroup Ecore_FB_Backlight_Group */ -int +EAPI int ecore_fb_backlight_get(void) { Ecore_Fb_Ts_Backlight bl; @@ -630,7 +630,7 @@ ecore_fb_backlight_get(void) * is brightest. * @ingroup Ecore_FB_Backlight_Group */ -void +EAPI void ecore_fb_backlight_brightness_set(double br) { Ecore_Fb_Ts_Backlight bl; @@ -650,7 +650,7 @@ ecore_fb_backlight_brightness_set(double br) * 1.0 is the brightest. * @ingroup Ecore_FB_Backlight_Group */ -double +EAPI double ecore_fb_backlight_brightness_get(void) { Ecore_Fb_Ts_Backlight bl; @@ -672,7 +672,7 @@ ecore_fb_backlight_brightness_get(void) * @param on @c 1 to indicate the LED should be on, @c 0 if it should be off. * @ingroup Ecore_FB_LED_Group */ -void +EAPI void ecore_fb_led_set(int on) { Ecore_Fb_Ts_Led led; @@ -689,7 +689,7 @@ ecore_fb_led_set(int on) * @ingroup Ecore_FB_LED_Group * @todo Documentation: Work out what speed the units are in. */ -void +EAPI void ecore_fb_led_blink_set(double speed) { Ecore_Fb_Ts_Led led; @@ -713,7 +713,7 @@ ecore_fb_led_blink_set(double speed) * @param cr Value between 0 and 1 that gives the new contrast of the screen. * @ingroup Ecore_FB_Contrast_Group */ -void +EAPI void ecore_fb_contrast_set(double cr) { Ecore_Fb_Ts_Contrast ct; @@ -732,7 +732,7 @@ ecore_fb_contrast_set(double cr) * screen. * @ingroup Ecore_FB_Contrast_Group */ -double +EAPI double ecore_fb_contrast_get(void) { Ecore_Fb_Ts_Contrast ct; @@ -747,7 +747,7 @@ ecore_fb_contrast_get(void) * * FIXME: To be fixed. */ -double +EAPI double ecore_fb_light_sensor_get(void) { Ecore_Fb_Ts_Flite fl; @@ -765,7 +765,7 @@ ecore_fb_light_sensor_get(void) * FIXME: To be fixed. * @todo Documentation: Find out what this does. */ -void +EAPI void ecore_fb_callback_gain_set(void (*func) (void *data), void *data) { _ecore_fb_func_fb_gain = func; @@ -778,7 +778,7 @@ ecore_fb_callback_gain_set(void (*func) (void *data), void *data) * FIXME: To be fixed. * @todo Documentation: Find out what this does. */ -void +EAPI void ecore_fb_callback_lose_set(void (*func) (void *data), void *data) { _ecore_fb_func_fb_lost = func; diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c index d06ff51fba..47da681761 100644 --- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c +++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c @@ -29,7 +29,7 @@ #define DLT_R2 15 /* byte swappers - for dealing with big vs little endian machines */ -unsigned short +EAPI unsigned short _ecore_ipc_swap_16(unsigned short v) { unsigned char *s, t; @@ -39,7 +39,7 @@ _ecore_ipc_swap_16(unsigned short v) return v; } -unsigned int +EAPI unsigned int _ecore_ipc_swap_32(unsigned int v) { unsigned char *s, t; @@ -50,7 +50,7 @@ _ecore_ipc_swap_32(unsigned int v) return v; } -unsigned long long +EAPI unsigned long long _ecore_ipc_swap_64(unsigned long long v) { unsigned char *s, t; @@ -220,12 +220,12 @@ static int _ecore_ipc_event_server_data(void *data, int ev_type, void *ev); static void _ecore_ipc_event_client_data_free(void *data, void *ev); static void _ecore_ipc_event_server_data_free(void *data, void *ev); -int ECORE_IPC_EVENT_CLIENT_ADD = 0; -int ECORE_IPC_EVENT_CLIENT_DEL = 0; -int ECORE_IPC_EVENT_SERVER_ADD = 0; -int ECORE_IPC_EVENT_SERVER_DEL = 0; -int ECORE_IPC_EVENT_CLIENT_DATA = 0; -int ECORE_IPC_EVENT_SERVER_DATA = 0; +EAPI int ECORE_IPC_EVENT_CLIENT_ADD = 0; +EAPI int ECORE_IPC_EVENT_CLIENT_DEL = 0; +EAPI int ECORE_IPC_EVENT_SERVER_ADD = 0; +EAPI int ECORE_IPC_EVENT_SERVER_DEL = 0; +EAPI int ECORE_IPC_EVENT_CLIENT_DATA = 0; +EAPI int ECORE_IPC_EVENT_SERVER_DATA = 0; static int init_count = 0; static Ecore_Ipc_Server *servers = NULL; @@ -243,7 +243,7 @@ static Ecore_Event_Handler *handler[6]; * being shut down. * @ingroup Ecore_IPC_Library_Group */ -int +EAPI int ecore_ipc_init(void) { int i = 0; @@ -280,7 +280,7 @@ ecore_ipc_init(void) * shut down. * @ingroup Ecore_IPC_Library_Group */ -int +EAPI int ecore_ipc_shutdown(void) { int i; @@ -317,7 +317,7 @@ ecore_ipc_shutdown(void) * @ingroup Ecore_IPC_Server_Group * @todo Need to add protocol type parameter to this function. */ -Ecore_Ipc_Server * +EAPI Ecore_Ipc_Server * ecore_ipc_server_add(Ecore_Ipc_Type compl_type, const char *name, int port, const void *data) { Ecore_Ipc_Server *svr; @@ -372,7 +372,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type compl_type, const char *name, int port, cons * @ingroup Ecore_IPC_Server_Group * @todo Need to add protocol type parameter. */ -Ecore_Ipc_Server * +EAPI Ecore_Ipc_Server * ecore_ipc_server_connect(Ecore_Ipc_Type compl_type, char *name, int port, const void *data) { Ecore_Ipc_Server *svr; @@ -416,7 +416,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type compl_type, char *name, int port, const * @return The data associated with the server when it was created. * @ingroup Ecore_IPC_Server_Group */ -void * +EAPI void * ecore_ipc_server_del(Ecore_Ipc_Server *svr) { void *data; @@ -443,7 +443,7 @@ ecore_ipc_server_del(Ecore_Ipc_Server *svr) * @return The associated data. * @ingroup Ecore_IPC_Server_Group */ -void * +EAPI void * ecore_ipc_server_data_get(Ecore_Ipc_Server *svr) { if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_IPC_SERVER)) @@ -461,7 +461,7 @@ ecore_ipc_server_data_get(Ecore_Ipc_Server *svr) * @return @c 1 if the server is connected. @c 0 otherwise. * @ingroup Ecore_IPC_Server_Group */ -int +EAPI int ecore_ipc_server_connected_get(Ecore_Ipc_Server *svr) { if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_IPC_SERVER)) @@ -524,7 +524,7 @@ ecore_ipc_server_connected_get(Ecore_Ipc_Server *svr) * @todo This function needs to become an IPC message. * @todo Fix up the documentation: Make sure what ref_to and response are. */ -int +EAPI int ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int minor, int ref, int ref_to, int response, void *data, int size) { Ecore_Ipc_Msg_Head msg; @@ -588,7 +588,7 @@ ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int minor, int ref, int * lower). * @ingroup Ecore_Ipc_Server_Group */ -void +EAPI void ecore_ipc_server_client_limit_set(Ecore_Ipc_Server *svr, int client_limit, char reject_excess_clients) { if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_IPC_SERVER)) @@ -654,7 +654,7 @@ ecore_ipc_server_client_limit_set(Ecore_Ipc_Server *svr, int client_limit, char * @todo This function needs to become an IPC message. * @todo Make sure ref_to and response parameters are described correctly. */ -int +EAPI int ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int minor, int ref, int ref_to, int response, void *data, int size) { Ecore_Ipc_Msg_Head msg; @@ -702,7 +702,7 @@ ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int minor, int ref, int r * @return The IPC server the IPC client is connected to. * @ingroup Ecore_IPC_Client_Group */ -Ecore_Ipc_Server * +EAPI Ecore_Ipc_Server * ecore_ipc_client_server_get(Ecore_Ipc_Client *cl) { if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT)) @@ -721,7 +721,7 @@ ecore_ipc_client_server_get(Ecore_Ipc_Client *cl) * @return Data associated with the client. * @ingroup Ecore_IPC_Client_Group */ -void * +EAPI void * ecore_ipc_client_del(Ecore_Ipc_Client *cl) { void *data; @@ -749,7 +749,7 @@ ecore_ipc_client_del(Ecore_Ipc_Client *cl) * @param data The data to associate with the IPC client. * @ingroup Ecore_IPC_Client_Group */ -void +EAPI void ecore_ipc_client_data_set(Ecore_Ipc_Client *cl, const void *data) { if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT)) @@ -767,7 +767,7 @@ ecore_ipc_client_data_set(Ecore_Ipc_Client *cl, const void *data) * @return The data associated with the IPC client. * @ingroup Ecore_IPC_Client_Group */ -void * +EAPI void * ecore_ipc_client_data_get(Ecore_Ipc_Client *cl) { if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT)) @@ -784,7 +784,7 @@ ecore_ipc_client_data_get(Ecore_Ipc_Client *cl) * @return 1 if SSL is available, 0 if it is not. * @ingroup Ecore_Con_Client_Group */ -int +EAPI int ecore_ipc_ssl_available_get(void) { return ecore_con_ssl_available_get(); diff --git a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c b/legacy/ecore/src/lib/ecore_txt/ecore_txt.c index 7525f2b41e..e7374579a1 100644 --- a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c +++ b/legacy/ecore/src/lib/ecore_txt/ecore_txt.c @@ -13,7 +13,7 @@ * * FIXME: Finish this. */ -char * +EAPI char * ecore_txt_convert(const char *enc_from, const char *enc_to, const char *text) { iconv_t ic;