fix up some warnings

SVN revision: 19563
This commit is contained in:
Carsten Haitzler 2006-01-06 17:58:12 +00:00
parent e886d21d78
commit 12aa35dd99
21 changed files with 229 additions and 228 deletions

View File

@ -40,7 +40,7 @@ int _ecore_fps_debug = 0;
* } * }
* @endcode * @endcode
*/ */
int EAPI int
ecore_init(void) ecore_init(void)
{ {
if (++_ecore_init_count == 1) if (++_ecore_init_count == 1)
@ -70,7 +70,7 @@ ecore_init(void)
* Do not call this function from any callback that may be called from the main * Do not call this function from any callback that may be called from the main
* loop, as the main loop will then fall over and not function properly. * loop, as the main loop will then fall over and not function properly.
*/ */
int EAPI int
ecore_shutdown(void) ecore_shutdown(void)
{ {
if (--_ecore_init_count) if (--_ecore_init_count)

View File

@ -25,7 +25,7 @@ static double animators_frametime = 1.0 / 30.0;
* 0 it will be deleted automatically making any references/handles for it * 0 it will be deleted automatically making any references/handles for it
* invalid. * invalid.
*/ */
Ecore_Animator * EAPI Ecore_Animator *
ecore_animator_add(int (*func) (void *data), const void *data) ecore_animator_add(int (*func) (void *data), const void *data)
{ {
Ecore_Animator *animator; Ecore_Animator *animator;
@ -54,7 +54,7 @@ ecore_animator_add(int (*func) (void *data), const void *data)
* call returns the specified animator object @p animator is invalid and should not * call returns the specified animator object @p animator is invalid and should not
* be used again. It will not get called again after deletion. * be used again. It will not get called again after deletion.
*/ */
void * EAPI void *
ecore_animator_del(Ecore_Animator *animator) ecore_animator_del(Ecore_Animator *animator)
{ {
if (!ECORE_MAGIC_CHECK(animator, ECORE_MAGIC_ANIMATOR)) if (!ECORE_MAGIC_CHECK(animator, ECORE_MAGIC_ANIMATOR))
@ -75,7 +75,7 @@ ecore_animator_del(Ecore_Animator *animator)
* *
* This function sets the time interval (in seconds) inbetween animator ticks. * This function sets the time interval (in seconds) inbetween animator ticks.
*/ */
void EAPI void
ecore_animator_frametime_set(double frametime) ecore_animator_frametime_set(double frametime)
{ {
if (frametime < 0.0) frametime = 0.0; if (frametime < 0.0) frametime = 0.0;
@ -96,7 +96,7 @@ ecore_animator_frametime_set(double frametime)
* *
* this function retrieves the time inbetween animator ticks, in seconds. * this function retrieves the time inbetween animator ticks, in seconds.
*/ */
double EAPI double
ecore_animator_frametime_get(void) ecore_animator_frametime_get(void)
{ {
return animators_frametime; return animators_frametime;

View File

@ -12,7 +12,7 @@ static char **app_argv = NULL;
* A call to this function will store the programs command-line arguments * A call to this function will store the programs command-line arguments
* for later use by ecore_app_restart() or ecore_app_args_get(). * for later use by ecore_app_restart() or ecore_app_args_get().
*/ */
void EAPI void
ecore_app_args_set(int argc, const char **argv) ecore_app_args_set(int argc, const char **argv)
{ {
if ((argc < 1) || if ((argc < 1) ||
@ -32,7 +32,7 @@ ecore_app_args_set(int argc, const char **argv)
* also if the pointer is not NULL. The values they are filled with will be the * also if the pointer is not NULL. The values they are filled with will be the
* same set by ecore_app_args_set(). * same set by ecore_app_args_set().
*/ */
void EAPI void
ecore_app_args_get(int *argc, char ***argv) ecore_app_args_get(int *argc, char ***argv)
{ {
if (argc) *argc = app_argc; if (argc) *argc = app_argc;
@ -49,7 +49,7 @@ ecore_app_args_get(int *argc, char ***argv)
* *
* FIXME: Currently not implimented. * FIXME: Currently not implimented.
*/ */
void EAPI void
ecore_app_restart(void) ecore_app_restart(void)
{ {
char **args; char **args;

View File

@ -40,7 +40,7 @@ static void *ecore_raw_event_event = NULL;
* particular event, so all handler set to handle that event type that have not * particular event, so all handler set to handle that event type that have not
* already been called, will not be. * already been called, will not be.
*/ */
Ecore_Event_Handler * EAPI Ecore_Event_Handler *
ecore_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data) ecore_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data)
{ {
Ecore_Event_Handler *eh; Ecore_Event_Handler *eh;
@ -90,7 +90,7 @@ ecore_event_handler_add(int type, int (*func) (void *data, int type, void *event
* handler was added by ecore_event_handler_add(). On failure NULL will be * handler was added by ecore_event_handler_add(). On failure NULL will be
* returned. Once a handler is deleted it will no longer be called. * returned. Once a handler is deleted it will no longer be called.
*/ */
void * EAPI void *
ecore_event_handler_del(Ecore_Event_Handler *event_handler) ecore_event_handler_del(Ecore_Event_Handler *event_handler)
{ {
Ecore_List2_Data *node; Ecore_List2_Data *node;
@ -131,7 +131,7 @@ static void _ecore_event_generic_free (void *data __UNUSED__, void *event)
* with the private structure pointer. * with the private structure pointer.
* func_free is passed @p data as its data parameter. * func_free is passed @p data as its data parameter.
*/ */
Ecore_Event * EAPI Ecore_Event *
ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), void *data) ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), void *data)
{ {
if (!ev) return NULL; if (!ev) return NULL;
@ -152,7 +152,7 @@ ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), vo
* cleanup, and so if the free function depends on the data pointer to work, * cleanup, and so if the free function depends on the data pointer to work,
* you should defer cleaning of this till the free function is called later. * you should defer cleaning of this till the free function is called later.
*/ */
void * EAPI void *
ecore_event_del(Ecore_Event *event) ecore_event_del(Ecore_Event *event)
{ {
if (!ECORE_MAGIC_CHECK(event, ECORE_MAGIC_EVENT)) if (!ECORE_MAGIC_CHECK(event, ECORE_MAGIC_EVENT))
@ -175,7 +175,7 @@ ecore_event_del(Ecore_Event *event)
* it is calculated, except that the ID will be unique to the current instance * it is calculated, except that the ID will be unique to the current instance
* of the process. * of the process.
*/ */
int EAPI int
ecore_event_type_new(void) ecore_event_type_new(void)
{ {
event_id_max++; event_id_max++;
@ -202,7 +202,7 @@ ecore_event_type_new(void)
* processing is finished @p func_end is called and is passed the loop_data * processing is finished @p func_end is called and is passed the loop_data
* and @p data pointer to clean up. * and @p data pointer to clean up.
*/ */
Ecore_Event_Filter * EAPI Ecore_Event_Filter *
ecore_event_filter_add(void * (*func_start) (void *data), int (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data) ecore_event_filter_add(void * (*func_start) (void *data), int (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data)
{ {
Ecore_Event_Filter *ef; Ecore_Event_Filter *ef;
@ -228,7 +228,7 @@ ecore_event_filter_add(void * (*func_start) (void *data), int (*func_filter) (vo
* will return the data pointer set when this filter was added. On failure * will return the data pointer set when this filter was added. On failure
* NULL is returned. * NULL is returned.
*/ */
void * EAPI void *
ecore_event_filter_del(Ecore_Event_Filter *ef) ecore_event_filter_del(Ecore_Event_Filter *ef)
{ {
if (!ECORE_MAGIC_CHECK(ef, ECORE_MAGIC_EVENT_FILTER)) if (!ECORE_MAGIC_CHECK(ef, ECORE_MAGIC_EVENT_FILTER))
@ -256,7 +256,7 @@ ecore_event_filter_del(Ecore_Event_Filter *ef)
* the program know if the event type being handled is one it wants to get more * the program know if the event type being handled is one it wants to get more
* information about. * information about.
*/ */
int EAPI int
ecore_event_current_type_get(void) ecore_event_current_type_get(void)
{ {
return ecore_raw_event_type; return ecore_raw_event_type;
@ -276,7 +276,7 @@ ecore_event_current_type_get(void)
* the program access the event data if the type of the event is handled by * the program access the event data if the type of the event is handled by
* the program. * the program.
*/ */
void * EAPI void *
ecore_event_current_event_get(void) ecore_event_current_event_get(void)
{ {
return ecore_raw_event_event; return ecore_raw_event_event;
@ -476,7 +476,7 @@ _ecore_event_exe_exit_free(void *data __UNUSED__, void *ev)
} }
#endif #endif
void * EAPI void *
_ecore_event_signal_user_new(void) _ecore_event_signal_user_new(void)
{ {
Ecore_Event_Signal_User *e; Ecore_Event_Signal_User *e;

View File

@ -27,7 +27,7 @@ static char *shell = NULL;
/* FIXME: This errno checking stuff should be put elsewhere for everybody to use. /* FIXME: This errno checking stuff should be put elsewhere for everybody to use.
* For now it lives here though, just to make testing easier. * For now it lives here though, just to make testing easier.
*/ */
int _ecore_exe_check_errno(int result, char *file, int line); static int _ecore_exe_check_errno(int result, char *file, int line);
#define E_IF_NO_ERRNO(result, foo, ok) \ #define E_IF_NO_ERRNO(result, foo, ok) \
while (((ok) = _ecore_exe_check_errno( (result) = (foo), __FILE__, __LINE__)) == -1) sleep(1); \ while (((ok) = _ecore_exe_check_errno( (result) = (foo), __FILE__, __LINE__)) == -1) sleep(1); \
if (ok) if (ok)
@ -38,7 +38,8 @@ int _ecore_exe_check_errno(int result, char *file, int line);
#define E_IF_NO_ERRNO_NOLOOP(result, foo, ok) \ #define E_IF_NO_ERRNO_NOLOOP(result, foo, ok) \
if (((ok) = _ecore_exe_check_errno( (result) = (foo), __FILE__, __LINE__))) if (((ok) = _ecore_exe_check_errno( (result) = (foo), __FILE__, __LINE__)))
int _ecore_exe_check_errno(int result, char *file, int line) static int
_ecore_exe_check_errno(int result, char *file, int line)
{ {
int saved_errno = errno; int saved_errno = errno;
@ -187,7 +188,7 @@ int _ecore_exe_check_errno(int result, char *file, int line)
* @return A process handle to the spawned process. * @return A process handle to the spawned process.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
Ecore_Exe * EAPI Ecore_Exe *
ecore_exe_run(const char *exe_cmd, const void *data) ecore_exe_run(const char *exe_cmd, const void *data)
{ {
Ecore_Exe *exe; Ecore_Exe *exe;
@ -235,7 +236,7 @@ ecore_exe_run(const char *exe_cmd, const void *data)
* @return A process handle to the spawned process. * @return A process handle to the spawned process.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
Ecore_Exe * EAPI Ecore_Exe *
ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
{ {
/* FIXME: Maybe we should allow STDERR reading as well. */ /* FIXME: Maybe we should allow STDERR reading as well. */
@ -424,7 +425,7 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
* @return 1 if successful, 0 on failure. * @return 1 if successful, 0 on failure.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
int EAPI int
ecore_exe_send(Ecore_Exe *exe, void *data, int size) ecore_exe_send(Ecore_Exe *exe, void *data, int size)
{ {
void *buf; void *buf;
@ -448,7 +449,7 @@ ecore_exe_send(Ecore_Exe *exe, void *data, int size)
* @param exe The child process * @param exe The child process
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
void EAPI void
ecore_exe_close_stdin(Ecore_Exe *exe) ecore_exe_close_stdin(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -468,7 +469,7 @@ ecore_exe_close_stdin(Ecore_Exe *exe)
* @param tag The string tag to set on the process handle. * @param tag The string tag to set on the process handle.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
void EAPI void
ecore_exe_tag_set(Ecore_Exe *exe, const char *tag) ecore_exe_tag_set(Ecore_Exe *exe, const char *tag)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -491,7 +492,7 @@ ecore_exe_tag_set(Ecore_Exe *exe, const char *tag)
* @return The string attached to @p exe. * @return The string attached to @p exe.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
char * EAPI char *
ecore_exe_tag_get(Ecore_Exe *exe) ecore_exe_tag_get(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -514,7 +515,7 @@ ecore_exe_tag_get(Ecore_Exe *exe)
* called. * called.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
void * EAPI void *
ecore_exe_free(Ecore_Exe *exe) ecore_exe_free(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -532,7 +533,7 @@ ecore_exe_free(Ecore_Exe *exe)
* @return The process ID on success. @c -1 otherwise. * @return The process ID on success. @c -1 otherwise.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
pid_t EAPI pid_t
ecore_exe_pid_get(Ecore_Exe *exe) ecore_exe_pid_get(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -550,7 +551,7 @@ ecore_exe_pid_get(Ecore_Exe *exe)
* @return The data pointer attached to @p exe. * @return The data pointer attached to @p exe.
* @ingroup Ecore_Exe_Basic_Group * @ingroup Ecore_Exe_Basic_Group
*/ */
void * EAPI void *
ecore_exe_data_get(Ecore_Exe *exe) ecore_exe_data_get(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -573,7 +574,7 @@ ecore_exe_data_get(Ecore_Exe *exe)
* @param exe Process handle to the given process. * @param exe Process handle to the given process.
* @ingroup Ecore_Exe_Signal_Group * @ingroup Ecore_Exe_Signal_Group
*/ */
void EAPI void
ecore_exe_pause(Ecore_Exe *exe) ecore_exe_pause(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -590,7 +591,7 @@ ecore_exe_pause(Ecore_Exe *exe)
* @param exe Process handle to the given process. * @param exe Process handle to the given process.
* @ingroup Ecore_Exe_Signal_Group * @ingroup Ecore_Exe_Signal_Group
*/ */
void EAPI void
ecore_exe_continue(Ecore_Exe *exe) ecore_exe_continue(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -607,7 +608,7 @@ ecore_exe_continue(Ecore_Exe *exe)
* @param exe Process handle to the given process. * @param exe Process handle to the given process.
* @ingroup Ecore_Exe_Signal_Group * @ingroup Ecore_Exe_Signal_Group
*/ */
void EAPI void
ecore_exe_terminate(Ecore_Exe *exe) ecore_exe_terminate(Ecore_Exe *exe)
{ {
struct _ecore_exe_dead_exe *dead; struct _ecore_exe_dead_exe *dead;
@ -635,7 +636,7 @@ ecore_exe_terminate(Ecore_Exe *exe)
* @param exe Process handle to the given process. * @param exe Process handle to the given process.
* @ingroup Ecore_Exe_Signal_Group * @ingroup Ecore_Exe_Signal_Group
*/ */
void EAPI void
ecore_exe_kill(Ecore_Exe *exe) ecore_exe_kill(Ecore_Exe *exe)
{ {
struct _ecore_exe_dead_exe *dead; struct _ecore_exe_dead_exe *dead;
@ -665,7 +666,7 @@ ecore_exe_kill(Ecore_Exe *exe)
* the signal will be ignored. * the signal will be ignored.
* @ingroup Ecore_Exe_Signal_Group * @ingroup Ecore_Exe_Signal_Group
*/ */
void EAPI void
ecore_exe_signal(Ecore_Exe *exe, int num) ecore_exe_signal(Ecore_Exe *exe, int num)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -685,7 +686,7 @@ ecore_exe_signal(Ecore_Exe *exe, int num)
* @param exe Process handle to the given process. * @param exe Process handle to the given process.
* @ingroup Ecore_Exe_Signal_Group * @ingroup Ecore_Exe_Signal_Group
*/ */
void EAPI void
ecore_exe_hup(Ecore_Exe *exe) ecore_exe_hup(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
@ -974,7 +975,7 @@ _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler)
int last = 0; int last = 0;
char *c; char *c;
c = inbuf; c = (char *)inbuf;
for (i = 0; i < inbuf_num; i++) /* Find the lines. */ for (i = 0; i < inbuf_num; i++) /* Find the lines. */
{ {
if (inbuf[i] == '\n') if (inbuf[i] == '\n')
@ -1002,7 +1003,7 @@ _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler)
e->lines[count].line = c; e->lines[count].line = c;
e->lines[count].size = i - last; e->lines[count].size = i - last;
last = i + 1; last = i + 1;
c = &inbuf[last]; c = (char *)&inbuf[last];
count++; count++;
} }
} }

View File

@ -48,7 +48,7 @@ static int _ecore_hash_node_destroy(Ecore_Hash_Node *node, Ecore_Free_Cb keyd,
* @return @c NULL on error, a new hash on success. * @return @c NULL on error, a new hash on success.
* @ingroup Ecore_Data_Hash_ADT_Creation_Group * @ingroup Ecore_Data_Hash_ADT_Creation_Group
*/ */
Ecore_Hash *ecore_hash_new(Ecore_Hash_Cb hash_func, Ecore_Compare_Cb compare) EAPI Ecore_Hash *ecore_hash_new(Ecore_Hash_Cb hash_func, Ecore_Compare_Cb compare)
{ {
Ecore_Hash *new_hash = (Ecore_Hash *)malloc(sizeof(Ecore_Hash)); Ecore_Hash *new_hash = (Ecore_Hash *)malloc(sizeof(Ecore_Hash));
if (!new_hash) if (!new_hash)
@ -70,7 +70,7 @@ Ecore_Hash *ecore_hash_new(Ecore_Hash_Cb hash_func, Ecore_Compare_Cb compare)
* @return @c TRUE on success, @c FALSE on an error. * @return @c TRUE on success, @c FALSE on an error.
* @ingroup Ecore_Data_Hash_ADT_Creation_Group * @ingroup Ecore_Data_Hash_ADT_Creation_Group
*/ */
int ecore_hash_init(Ecore_Hash *hash, Ecore_Hash_Cb hash_func, Ecore_Compare_Cb compare) EAPI int ecore_hash_init(Ecore_Hash *hash, Ecore_Hash_Cb hash_func, Ecore_Compare_Cb compare)
{ {
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE); CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
@ -100,7 +100,7 @@ int ecore_hash_init(Ecore_Hash *hash, Ecore_Hash_Cb hash_func, Ecore_Compare_Cb
* @return @c TRUE on success, @c FALSE on error. * @return @c TRUE on success, @c FALSE on error.
* @ingroup Ecore_Data_Hash_ADT_Destruction_Group * @ingroup Ecore_Data_Hash_ADT_Destruction_Group
*/ */
int ecore_hash_set_free_key(Ecore_Hash *hash, Ecore_Free_Cb function) EAPI int ecore_hash_set_free_key(Ecore_Hash *hash, Ecore_Free_Cb function)
{ {
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE); CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
CHECK_PARAM_POINTER_RETURN("function", function, FALSE); CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
@ -119,7 +119,7 @@ int ecore_hash_set_free_key(Ecore_Hash *hash, Ecore_Free_Cb function)
* @return @c TRUE on success, @c FALSE on error * @return @c TRUE on success, @c FALSE on error
* @ingroup Ecore_Data_Hash_ADT_Destruction_Group * @ingroup Ecore_Data_Hash_ADT_Destruction_Group
*/ */
int ecore_hash_set_free_value(Ecore_Hash *hash, Ecore_Free_Cb function) EAPI int ecore_hash_set_free_value(Ecore_Hash *hash, Ecore_Free_Cb function)
{ {
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE); CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
CHECK_PARAM_POINTER_RETURN("function", function, FALSE); CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
@ -145,7 +145,7 @@ int ecore_hash_set_free_value(Ecore_Hash *hash, Ecore_Free_Cb function)
* @return @c TRUE if successful, @c FALSE if not. * @return @c TRUE if successful, @c FALSE if not.
* @ingroup Ecore_Data_Hash_ADT_Data_Group * @ingroup Ecore_Data_Hash_ADT_Data_Group
*/ */
int ecore_hash_set(Ecore_Hash *hash, void *key, void *value) EAPI int ecore_hash_set(Ecore_Hash *hash, void *key, void *value)
{ {
int ret = FALSE; int ret = FALSE;
Ecore_Hash_Node *node; Ecore_Hash_Node *node;
@ -172,7 +172,7 @@ int ecore_hash_set(Ecore_Hash *hash, void *key, void *value)
* @return @c TRUE on success, @c FALSE on error. * @return @c TRUE on success, @c FALSE on error.
* @ingroup Ecore_Data_Hash_ADT_Destruction_Group * @ingroup Ecore_Data_Hash_ADT_Destruction_Group
*/ */
void ecore_hash_destroy(Ecore_Hash *hash) EAPI void ecore_hash_destroy(Ecore_Hash *hash)
{ {
unsigned int i = 0; unsigned int i = 0;
@ -223,7 +223,7 @@ void ecore_hash_destroy(Ecore_Hash *hash)
* @return TRUE on success, FALSE otherwise. * @return TRUE on success, FALSE otherwise.
* @ingroup Ecore_Data_Hash_ADT_Traverse_Group * @ingroup Ecore_Data_Hash_ADT_Traverse_Group
*/ */
int ecore_hash_for_each_node(Ecore_Hash *hash, Ecore_For_Each for_each_func, EAPI int ecore_hash_for_each_node(Ecore_Hash *hash, Ecore_For_Each for_each_func,
void *user_data) void *user_data)
{ {
unsigned int i = 0; unsigned int i = 0;
@ -255,7 +255,7 @@ int ecore_hash_for_each_node(Ecore_Hash *hash, Ecore_For_Each for_each_func,
* @return new ecore_list on success, NULL otherwise * @return new ecore_list on success, NULL otherwise
* @ingroup Ecore_Data_Hash_ADT_Traverse_Group * @ingroup Ecore_Data_Hash_ADT_Traverse_Group
*/ */
Ecore_List *ecore_hash_keys(Ecore_Hash *hash) EAPI Ecore_List *ecore_hash_keys(Ecore_Hash *hash)
{ {
unsigned int i = 0; unsigned int i = 0;
Ecore_List *keys; Ecore_List *keys;
@ -288,7 +288,7 @@ Ecore_List *ecore_hash_keys(Ecore_Hash *hash)
* Prints the distribution of the given hash table for graphing. * Prints the distribution of the given hash table for graphing.
* @param hash The given hash table. * @param hash The given hash table.
*/ */
void EAPI void
ecore_hash_dump_graph(Ecore_Hash *hash) ecore_hash_dump_graph(Ecore_Hash *hash)
{ {
unsigned int i; unsigned int i;
@ -360,7 +360,7 @@ _ecore_hash_add_node(Ecore_Hash *hash, Ecore_Hash_Node *node)
* @return The value corresponding to key on success, @c NULL otherwise. * @return The value corresponding to key on success, @c NULL otherwise.
* @ingroup Ecore_Data_Hash_ADT_Data_Group * @ingroup Ecore_Data_Hash_ADT_Data_Group
*/ */
void *ecore_hash_get(Ecore_Hash *hash, void *key) EAPI void *ecore_hash_get(Ecore_Hash *hash, void *key)
{ {
void *data; void *data;
Ecore_Hash_Node *node; Ecore_Hash_Node *node;
@ -388,7 +388,7 @@ void *ecore_hash_get(Ecore_Hash *hash, void *key)
* returned if there is an error. * returned if there is an error.
* @ingroup Ecore_Data_Hash_ADT_Data_Group * @ingroup Ecore_Data_Hash_ADT_Data_Group
*/ */
void *ecore_hash_remove(Ecore_Hash *hash, void *key) EAPI void *ecore_hash_remove(Ecore_Hash *hash, void *key)
{ {
Ecore_Hash_Node *node = NULL; Ecore_Hash_Node *node = NULL;
Ecore_Hash_Node *list; Ecore_Hash_Node *list;

View File

@ -12,7 +12,7 @@ static int idle_enterers_delete_me = 0;
* NULL is returned. * NULL is returned.
* @ingroup Idle_Group * @ingroup Idle_Group
*/ */
Ecore_Idle_Enterer * EAPI Ecore_Idle_Enterer *
ecore_idle_enterer_add(int (*func) (void *data), const void *data) ecore_idle_enterer_add(int (*func) (void *data), const void *data)
{ {
Ecore_Idle_Enterer *ie; Ecore_Idle_Enterer *ie;
@ -34,7 +34,7 @@ ecore_idle_enterer_add(int (*func) (void *data), const void *data)
* NULL otherwise. * NULL otherwise.
* @ingroup Idle_Group * @ingroup Idle_Group
*/ */
void * EAPI void *
ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer) ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
{ {
if (!ECORE_MAGIC_CHECK(idle_enterer, ECORE_MAGIC_IDLE_ENTERER)) if (!ECORE_MAGIC_CHECK(idle_enterer, ECORE_MAGIC_IDLE_ENTERER))

View File

@ -11,7 +11,7 @@ static int idle_exiters_delete_me = 0;
* @return A handle to the idle exiter callback on success. NULL otherwise. * @return A handle to the idle exiter callback on success. NULL otherwise.
* @ingroup Idle_Group * @ingroup Idle_Group
*/ */
Ecore_Idle_Exiter * EAPI Ecore_Idle_Exiter *
ecore_idle_exiter_add(int (*func) (void *data), const void *data) ecore_idle_exiter_add(int (*func) (void *data), const void *data)
{ {
Ecore_Idle_Exiter *ie; Ecore_Idle_Exiter *ie;
@ -33,7 +33,7 @@ ecore_idle_exiter_add(int (*func) (void *data), const void *data)
* successful. NULL otherwise. * successful. NULL otherwise.
* @ingroup Idle_Group * @ingroup Idle_Group
*/ */
void * EAPI void *
ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter) ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
{ {
if (!ECORE_MAGIC_CHECK(idle_exiter, ECORE_MAGIC_IDLE_EXITER)) if (!ECORE_MAGIC_CHECK(idle_exiter, ECORE_MAGIC_IDLE_EXITER))

View File

@ -11,7 +11,7 @@ static int idlers_delete_me = 0;
* @return A idler handle if successfully added. NULL otherwise. * @return A idler handle if successfully added. NULL otherwise.
* @ingroup Idle_Group * @ingroup Idle_Group
*/ */
Ecore_Idler * EAPI Ecore_Idler *
ecore_idler_add(int (*func) (void *data), const void *data) ecore_idler_add(int (*func) (void *data), const void *data)
{ {
Ecore_Idler *ie; Ecore_Idler *ie;
@ -33,7 +33,7 @@ ecore_idler_add(int (*func) (void *data), const void *data)
* otherwise. * otherwise.
* @ingroup Idle_Group * @ingroup Idle_Group
*/ */
void * EAPI void *
ecore_idler_del(Ecore_Idler *idler) ecore_idler_del(Ecore_Idler *idler)
{ {
if (!ECORE_MAGIC_CHECK(idler, ECORE_MAGIC_IDLER)) if (!ECORE_MAGIC_CHECK(idler, ECORE_MAGIC_IDLER))

View File

@ -32,7 +32,7 @@ static void *_ecore_dlist_remove_first(Ecore_DList *list);
static void *_ecore_dlist_goto_index(Ecore_DList *list, int index); static void *_ecore_dlist_goto_index(Ecore_DList *list, int index);
/* XXX: Begin deprecated code */ /* XXX: Begin deprecated code */
void * EAPI void *
_ecore_list2_append(void *in_list, void *in_item) _ecore_list2_append(void *in_list, void *in_item)
{ {
Ecore_List2 *l, *new_l; Ecore_List2 *l, *new_l;
@ -56,7 +56,7 @@ _ecore_list2_append(void *in_list, void *in_item)
return list; return list;
} }
void * EAPI void *
_ecore_list2_prepend(void *in_list, void *in_item) _ecore_list2_prepend(void *in_list, void *in_item)
{ {
Ecore_List2 *new_l; Ecore_List2 *new_l;
@ -79,7 +79,7 @@ _ecore_list2_prepend(void *in_list, void *in_item)
return new_l; return new_l;
} }
void * EAPI void *
_ecore_list2_append_relative(void *in_list, void *in_item, void *in_relative) _ecore_list2_append_relative(void *in_list, void *in_item, void *in_relative)
{ {
Ecore_List2 *l; Ecore_List2 *l;
@ -112,7 +112,7 @@ _ecore_list2_append_relative(void *in_list, void *in_item, void *in_relative)
return _ecore_list2_append(list, item); return _ecore_list2_append(list, item);
} }
void * EAPI void *
_ecore_list2_prepend_relative(void *in_list, void *in_item, void *in_relative) _ecore_list2_prepend_relative(void *in_list, void *in_item, void *in_relative)
{ {
Ecore_List2 *l; Ecore_List2 *l;
@ -154,7 +154,7 @@ _ecore_list2_prepend_relative(void *in_list, void *in_item, void *in_relative)
return _ecore_list2_prepend(list, item); return _ecore_list2_prepend(list, item);
} }
void * EAPI void *
_ecore_list2_remove(void *in_list, void *in_item) _ecore_list2_remove(void *in_list, void *in_item)
{ {
Ecore_List2 *return_l; Ecore_List2 *return_l;
@ -187,7 +187,7 @@ _ecore_list2_remove(void *in_list, void *in_item)
return return_l; return return_l;
} }
void * EAPI void *
_ecore_list2_find(void *in_list, void *in_item) _ecore_list2_find(void *in_list, void *in_item)
{ {
Ecore_List2 *l; Ecore_List2 *l;
@ -214,7 +214,7 @@ Functions that create, initialize and destroy Ecore_Lists.
* @return A new initialized list on success, @c NULL on failure. * @return A new initialized list on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Creation_Group * @ingroup Ecore_Data_List_Creation_Group
*/ */
Ecore_List *ecore_list_new() EAPI Ecore_List *ecore_list_new()
{ {
Ecore_List *list; Ecore_List *list;
@ -236,7 +236,7 @@ Ecore_List *ecore_list_new()
* @return @c TRUE if successful, @c FALSE if an error occurs. * @return @c TRUE if successful, @c FALSE if an error occurs.
* @ingroup Ecore_Data_List_Creation_Group * @ingroup Ecore_Data_List_Creation_Group
*/ */
int ecore_list_init(Ecore_List *list) EAPI int ecore_list_init(Ecore_List *list)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -250,7 +250,7 @@ int ecore_list_init(Ecore_List *list)
* @param list The list to be freed. * @param list The list to be freed.
* @ingroup Ecore_Data_List_Creation_Group * @ingroup Ecore_Data_List_Creation_Group
*/ */
void ecore_list_destroy(Ecore_List * list) EAPI void ecore_list_destroy(Ecore_List * list)
{ {
void *data; void *data;
@ -272,7 +272,7 @@ void ecore_list_destroy(Ecore_List * list)
* @param free_func The function that will free the key data. * @param free_func The function that will free the key data.
* @return @c TRUE on successful set, @c FALSE otherwise. * @return @c TRUE on successful set, @c FALSE otherwise.
*/ */
int ecore_list_set_free_cb(Ecore_List * list, Ecore_Free_Cb free_func) EAPI int ecore_list_set_free_cb(Ecore_List * list, Ecore_Free_Cb free_func)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -286,7 +286,7 @@ int ecore_list_set_free_cb(Ecore_List * list, Ecore_Free_Cb free_func)
* @param list The list to check for nodes * @param list The list to check for nodes
* @return @c TRUE if no nodes in list, @c FALSE if the list contains nodes * @return @c TRUE if no nodes in list, @c FALSE if the list contains nodes
*/ */
int ecore_list_is_empty(Ecore_List * list) EAPI int ecore_list_is_empty(Ecore_List * list)
{ {
int ret = TRUE; int ret = TRUE;
@ -303,7 +303,7 @@ int ecore_list_is_empty(Ecore_List * list)
* @param list The list to return the number of the current node. * @param list The list to return the number of the current node.
* @return The number of the current node in the list. * @return The number of the current node in the list.
*/ */
int ecore_list_index(Ecore_List * list) EAPI int ecore_list_index(Ecore_List * list)
{ {
int ret; int ret;
@ -319,7 +319,7 @@ int ecore_list_index(Ecore_List * list)
* @param list The list to find the number of nodes * @param list The list to find the number of nodes
* @return The number of nodes in the list. * @return The number of nodes in the list.
*/ */
int ecore_list_nodes(Ecore_List * list) EAPI int ecore_list_nodes(Ecore_List * list)
{ {
int ret = 0; int ret = 0;
@ -343,7 +343,7 @@ Functions that are used to add nodes to an Ecore_List.
* @return @c FALSE if an error occurs, @c TRUE if appended successfully * @return @c FALSE if an error occurs, @c TRUE if appended successfully
* @ingroup Ecore_Data_List_Add_Item_Group * @ingroup Ecore_Data_List_Add_Item_Group
*/ */
inline int ecore_list_append(Ecore_List * list, void *data) EAPI inline int ecore_list_append(Ecore_List * list, void *data)
{ {
int ret; int ret;
Ecore_List_Node *node; Ecore_List_Node *node;
@ -388,7 +388,7 @@ static int _ecore_list_append_0(Ecore_List * list, Ecore_List_Node *end)
* @return @c FALSE if an error occurs, @c TRUE if prepended successfully. * @return @c FALSE if an error occurs, @c TRUE if prepended successfully.
* @ingroup Ecore_Data_List_Add_Item_Group * @ingroup Ecore_Data_List_Add_Item_Group
*/ */
inline int ecore_list_prepend(Ecore_List * list, void *data) EAPI inline int ecore_list_prepend(Ecore_List * list, void *data)
{ {
int ret; int ret;
Ecore_List_Node *node; Ecore_List_Node *node;
@ -428,7 +428,7 @@ static int _ecore_list_prepend_0(Ecore_List * list, Ecore_List_Node *start)
* @return @c FALSE if there is an error, @c TRUE on success * @return @c FALSE if there is an error, @c TRUE on success
* @ingroup Ecore_Data_List_Add_Item_Group * @ingroup Ecore_Data_List_Add_Item_Group
*/ */
inline int ecore_list_insert(Ecore_List * list, void *data) EAPI inline int ecore_list_insert(Ecore_List * list, void *data)
{ {
int ret; int ret;
Ecore_List_Node *node; Ecore_List_Node *node;
@ -490,7 +490,7 @@ Functions that remove nodes from an Ecore_List.
* @return A pointer to the removed data on success, @c NULL on failure. * @return A pointer to the removed data on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Remove_Item_Group * @ingroup Ecore_Data_List_Remove_Item_Group
*/ */
inline void *ecore_list_remove(Ecore_List * list) EAPI inline void *ecore_list_remove(Ecore_List * list)
{ {
void *ret; void *ret;
@ -545,7 +545,7 @@ static void *_ecore_list_remove_0(Ecore_List * list)
* @return @c TRUE on success, @c FALSE on error * @return @c TRUE on success, @c FALSE on error
* @ingroup Ecore_Data_List_Remove_Item_Group * @ingroup Ecore_Data_List_Remove_Item_Group
*/ */
int ecore_list_remove_destroy(Ecore_List *list) EAPI int ecore_list_remove_destroy(Ecore_List *list)
{ {
void *data; void *data;
@ -565,7 +565,7 @@ int ecore_list_remove_destroy(Ecore_List *list)
* failure. * failure.
* @ingroup Ecore_Data_List_Remove_Item_Group * @ingroup Ecore_Data_List_Remove_Item_Group
*/ */
inline void *ecore_list_remove_first(Ecore_List * list) EAPI inline void *ecore_list_remove_first(Ecore_List * list)
{ {
void *ret; void *ret;
@ -618,7 +618,7 @@ static void *_ecore_list_remove_first(Ecore_List * list)
* @return A pointer to the removed data on success, @c NULL on failure. * @return A pointer to the removed data on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Remove_Item_Group * @ingroup Ecore_Data_List_Remove_Item_Group
*/ */
inline void *ecore_list_remove_last(Ecore_List * list) EAPI inline void *ecore_list_remove_last(Ecore_List * list)
{ {
void *ret; void *ret;
@ -685,7 +685,7 @@ Functions that can be used to traverse an Ecore_List.
* @return A pointer to new current item on success, @c NULL on failure. * @return A pointer to new current item on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Traverse_Group * @ingroup Ecore_Data_List_Traverse_Group
*/ */
inline void *ecore_list_goto_index(Ecore_List * list, int index) EAPI inline void *ecore_list_goto_index(Ecore_List * list, int index)
{ {
void *ret; void *ret;
@ -730,7 +730,7 @@ static void *_ecore_list_goto_index(Ecore_List *list, int index)
* @return A pointer to @p data on success, @c NULL on failure. * @return A pointer to @p data on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Traverse_Group * @ingroup Ecore_Data_List_Traverse_Group
*/ */
inline void *ecore_list_goto(Ecore_List * list, void *data) EAPI inline void *ecore_list_goto(Ecore_List * list, void *data)
{ {
void *ret; void *ret;
@ -781,7 +781,7 @@ static void *_ecore_list_goto(Ecore_List * list, void *data)
* @return A pointer to the first item on success, @c NULL on failure * @return A pointer to the first item on success, @c NULL on failure
* @ingroup Ecore_Data_List_Traverse_Group * @ingroup Ecore_Data_List_Traverse_Group
*/ */
inline void *ecore_list_goto_first(Ecore_List *list) EAPI inline void *ecore_list_goto_first(Ecore_List *list)
{ {
void *ret; void *ret;
@ -810,7 +810,7 @@ static void *_ecore_list_goto_first(Ecore_List * list)
* @return A pointer to the last item on success, @c NULL on failure. * @return A pointer to the last item on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Traverse_Group * @ingroup Ecore_Data_List_Traverse_Group
*/ */
inline void *ecore_list_goto_last(Ecore_List * list) EAPI inline void *ecore_list_goto_last(Ecore_List * list)
{ {
void *ret; void *ret;
@ -838,7 +838,7 @@ static void *_ecore_list_goto_last(Ecore_List * list)
* @param list The list. * @param list The list.
* @return Returns the data at current position, can be @c NULL. * @return Returns the data at current position, can be @c NULL.
*/ */
inline void *ecore_list_current(Ecore_List * list) EAPI inline void *ecore_list_current(Ecore_List * list)
{ {
void *ret; void *ret;
@ -866,7 +866,7 @@ static void *_ecore_list_current(Ecore_List * list)
* @param list The list to retrieve data from. * @param list The list to retrieve data from.
* @return The current item in the list on success, @c NULL on failure. * @return The current item in the list on success, @c NULL on failure.
*/ */
inline void *ecore_list_next(Ecore_List * list) EAPI inline void *ecore_list_next(Ecore_List * list)
{ {
void *data; void *data;
@ -905,7 +905,7 @@ static void *_ecore_list_next(Ecore_List * list)
* @note The data for each item on the list is not freed by * @note The data for each item on the list is not freed by
* @c ecore_list_clear(). * @c ecore_list_clear().
*/ */
int ecore_list_clear(Ecore_List * list) EAPI int ecore_list_clear(Ecore_List * list)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -922,7 +922,7 @@ int ecore_list_clear(Ecore_List * list)
* @return Returns @c TRUE on success, @c FALSE on failure. * @return Returns @c TRUE on success, @c FALSE on failure.
* @ingroup Ecore_Data_List_Traverse_Group * @ingroup Ecore_Data_List_Traverse_Group
*/ */
int ecore_list_for_each(Ecore_List *list, Ecore_For_Each function, EAPI int ecore_list_for_each(Ecore_List *list, Ecore_For_Each function,
void *user_data) void *user_data)
{ {
int ret; int ret;
@ -951,7 +951,7 @@ static int _ecore_list_for_each(Ecore_List *list, Ecore_For_Each function,
} }
/* Initialize a node to starting values */ /* Initialize a node to starting values */
int ecore_list_node_init(Ecore_List_Node * node) EAPI int ecore_list_node_init(Ecore_List_Node * node)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, FALSE); CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
@ -974,7 +974,7 @@ Ecore_List nodes.
* @return A new Ecore_List_Node on success, @c NULL otherwise. * @return A new Ecore_List_Node on success, @c NULL otherwise.
* @ingroup Ecore_Data_List_Node_Group * @ingroup Ecore_Data_List_Node_Group
*/ */
Ecore_List_Node *ecore_list_node_new() EAPI Ecore_List_Node *ecore_list_node_new()
{ {
Ecore_List_Node *new_node; Ecore_List_Node *new_node;
@ -995,7 +995,7 @@ Ecore_List_Node *ecore_list_node_new()
* @return @c TRUE. * @return @c TRUE.
* @ingroup Ecore_Data_List_Node_Group * @ingroup Ecore_Data_List_Node_Group
*/ */
int ecore_list_node_destroy(Ecore_List_Node * node, Ecore_Free_Cb free_func) EAPI int ecore_list_node_destroy(Ecore_List_Node * node, Ecore_Free_Cb free_func)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, FALSE); CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
@ -1019,7 +1019,7 @@ int ecore_list_node_destroy(Ecore_List_Node * node, Ecore_Free_Cb free_func)
* on failure. * on failure.
* @ingroup Ecore_Data_DList_Creation_Group * @ingroup Ecore_Data_DList_Creation_Group
*/ */
Ecore_DList *ecore_dlist_new() EAPI Ecore_DList *ecore_dlist_new()
{ {
Ecore_DList *list = NULL; Ecore_DList *list = NULL;
@ -1041,7 +1041,7 @@ Ecore_DList *ecore_dlist_new()
* @return @c TRUE if successful, @c FALSE if an error occurs. * @return @c TRUE if successful, @c FALSE if an error occurs.
* @ingroup Ecore_Data_DList_Creation_Group * @ingroup Ecore_Data_DList_Creation_Group
*/ */
int ecore_dlist_init(Ecore_DList *list) EAPI int ecore_dlist_init(Ecore_DList *list)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -1055,7 +1055,7 @@ int ecore_dlist_init(Ecore_DList *list)
* @param list The doubly linked list to be freed. * @param list The doubly linked list to be freed.
* @ingroup Ecore_Data_DList_Creation_Group * @ingroup Ecore_Data_DList_Creation_Group
*/ */
void ecore_dlist_destroy(Ecore_DList * list) EAPI void ecore_dlist_destroy(Ecore_DList * list)
{ {
void *data; void *data;
CHECK_PARAM_POINTER("list", list); CHECK_PARAM_POINTER("list", list);
@ -1077,7 +1077,7 @@ void ecore_dlist_destroy(Ecore_DList * list)
* @return @c TRUE on success, @c FALSE on failure. * @return @c TRUE on success, @c FALSE on failure.
* @ingroup Ecore_Data_DList_Creation_Group * @ingroup Ecore_Data_DList_Creation_Group
*/ */
int ecore_dlist_set_free_cb(Ecore_DList * list, Ecore_Free_Cb free_func) EAPI int ecore_dlist_set_free_cb(Ecore_DList * list, Ecore_Free_Cb free_func)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -1089,7 +1089,7 @@ int ecore_dlist_set_free_cb(Ecore_DList * list, Ecore_Free_Cb free_func)
* @param list The given doubly linked list. * @param list The given doubly linked list.
* @return @c TRUE if there are nodes, @c FALSE otherwise. * @return @c TRUE if there are nodes, @c FALSE otherwise.
*/ */
int ecore_dlist_is_empty(Ecore_DList * list) EAPI int ecore_dlist_is_empty(Ecore_DList * list)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -1101,7 +1101,7 @@ int ecore_dlist_is_empty(Ecore_DList * list)
* @param list The given doubly linked list. * @param list The given doubly linked list.
* @return The index of the current node. * @return The index of the current node.
*/ */
inline int ecore_dlist_index(Ecore_DList * list) EAPI inline int ecore_dlist_index(Ecore_DList * list)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -1121,7 +1121,7 @@ inline int ecore_dlist_index(Ecore_DList * list)
* @return @c TRUE if the data is successfully appended, @c FALSE otherwise. * @return @c TRUE if the data is successfully appended, @c FALSE otherwise.
* @ingroup Ecore_Data_DList_Add_Item_Group * @ingroup Ecore_Data_DList_Add_Item_Group
*/ */
int ecore_dlist_append(Ecore_DList * list, void *data) EAPI int ecore_dlist_append(Ecore_DList * list, void *data)
{ {
int ret; int ret;
Ecore_DList_Node *prev; Ecore_DList_Node *prev;
@ -1148,7 +1148,7 @@ int ecore_dlist_append(Ecore_DList * list, void *data)
* @return @c TRUE if the data is successfully prepended, @c FALSE otherwise. * @return @c TRUE if the data is successfully prepended, @c FALSE otherwise.
* @ingroup Ecore_Data_DList_Add_Item_Group * @ingroup Ecore_Data_DList_Add_Item_Group
*/ */
int ecore_dlist_prepend(Ecore_DList * list, void *data) EAPI int ecore_dlist_prepend(Ecore_DList * list, void *data)
{ {
int ret; int ret;
Ecore_DList_Node *prev; Ecore_DList_Node *prev;
@ -1174,7 +1174,7 @@ int ecore_dlist_prepend(Ecore_DList * list, void *data)
* @return @c TRUE on success, @c FALSE otherwise. * @return @c TRUE on success, @c FALSE otherwise.
* @ingroup Ecore_Data_DList_Add_Item_Group * @ingroup Ecore_Data_DList_Add_Item_Group
*/ */
int ecore_dlist_insert(Ecore_DList * list, void *data) EAPI int ecore_dlist_insert(Ecore_DList * list, void *data)
{ {
int ret; int ret;
Ecore_DList_Node *prev; Ecore_DList_Node *prev;
@ -1218,7 +1218,7 @@ int ecore_dlist_insert(Ecore_DList * list, void *data)
* @return A pointer to the removed data on success, @c NULL otherwise. * @return A pointer to the removed data on success, @c NULL otherwise.
* @ingroup Ecore_Data_DList_Remove_Item_Group * @ingroup Ecore_Data_DList_Remove_Item_Group
*/ */
void *ecore_dlist_remove(Ecore_DList * list) EAPI void *ecore_dlist_remove(Ecore_DList * list)
{ {
void *ret; void *ret;
Ecore_List *l2 = ECORE_LIST(list); Ecore_List *l2 = ECORE_LIST(list);
@ -1242,7 +1242,7 @@ void *ecore_dlist_remove(Ecore_DList * list)
* @return A pointer to the removed data on success, @c NULL on failure. * @return A pointer to the removed data on success, @c NULL on failure.
* @ingroup Ecore_Data_DList_Remove_Item_Group * @ingroup Ecore_Data_DList_Remove_Item_Group
*/ */
void *ecore_dlist_remove_first(Ecore_DList * list) EAPI void *ecore_dlist_remove_first(Ecore_DList * list)
{ {
void *ret; void *ret;
@ -1260,7 +1260,7 @@ void *ecore_dlist_remove_first(Ecore_DList * list)
* @return @c TRUE on success, @c FALSE otherwise. * @return @c TRUE on success, @c FALSE otherwise.
* @ingroup Ecore_Data_DList_Remove_Item_Group * @ingroup Ecore_Data_DList_Remove_Item_Group
*/ */
int ecore_dlist_remove_destroy(Ecore_DList *list) EAPI int ecore_dlist_remove_destroy(Ecore_DList *list)
{ {
void *data; void *data;
@ -1296,7 +1296,7 @@ static void *_ecore_dlist_remove_first(Ecore_DList *list)
* @return A pointer to the removed data on success, @c NULL otherwise. * @return A pointer to the removed data on success, @c NULL otherwise.
* @ingroup Ecore_Data_DList_Remove_Item_Group * @ingroup Ecore_Data_DList_Remove_Item_Group
*/ */
void *ecore_dlist_remove_last(Ecore_DList * list) EAPI void *ecore_dlist_remove_last(Ecore_DList * list)
{ {
void *ret; void *ret;
@ -1313,7 +1313,7 @@ void *ecore_dlist_remove_last(Ecore_DList * list)
* @param index The position to move the current item * @param index The position to move the current item
* @return The node at specified index on success, @c NULL on error. * @return The node at specified index on success, @c NULL on error.
*/ */
void *ecore_dlist_goto_index(Ecore_DList * list, int index) EAPI void *ecore_dlist_goto_index(Ecore_DList * list, int index)
{ {
void *ret; void *ret;
@ -1364,7 +1364,7 @@ static void *_ecore_dlist_goto_index(Ecore_DList *list, int index)
* *
* @return Returns specified data on success, NULL on error * @return Returns specified data on success, NULL on error
*/ */
void *ecore_dlist_goto(Ecore_DList * list, void *data) EAPI void *ecore_dlist_goto(Ecore_DList * list, void *data)
{ {
void *ret; void *ret;
@ -1381,7 +1381,7 @@ void *ecore_dlist_goto(Ecore_DList * list, void *data)
* *
* @return Returns a pointer to the first item on success, NULL on failure. * @return Returns a pointer to the first item on success, NULL on failure.
*/ */
void *ecore_dlist_goto_first(Ecore_DList *list) EAPI void *ecore_dlist_goto_first(Ecore_DList *list)
{ {
void *ret; void *ret;
@ -1397,7 +1397,7 @@ void *ecore_dlist_goto_first(Ecore_DList *list)
* @param list: the list to move the current item pointer to the last * @param list: the list to move the current item pointer to the last
* @return Returns a pointer to the last item in the list , NULL if empty. * @return Returns a pointer to the last item in the list , NULL if empty.
*/ */
void *ecore_dlist_goto_last(Ecore_DList * list) EAPI void *ecore_dlist_goto_last(Ecore_DList * list)
{ {
void *ret; void *ret;
@ -1413,7 +1413,7 @@ void *ecore_dlist_goto_last(Ecore_DList * list)
* @param list: the list to the return the current data * @param list: the list to the return the current data
* @return Returns value of the current data item, NULL if no current item * @return Returns value of the current data item, NULL if no current item
*/ */
void *ecore_dlist_current(Ecore_DList * list) EAPI void *ecore_dlist_current(Ecore_DList * list)
{ {
void *ret; void *ret;
@ -1427,7 +1427,7 @@ void *ecore_dlist_current(Ecore_DList * list)
* @param list: the list to move to the next item in. * @param list: the list to move to the next item in.
* @return Returns data in the current list node, or NULL on error * @return Returns data in the current list node, or NULL on error
*/ */
void *ecore_dlist_next(Ecore_DList * list) EAPI void *ecore_dlist_next(Ecore_DList * list)
{ {
void *data; void *data;
@ -1441,7 +1441,7 @@ void *ecore_dlist_next(Ecore_DList * list)
* @param list: the list to move to the previous item in. * @param list: the list to move to the previous item in.
* @return Returns data in the current list node, or NULL on error * @return Returns data in the current list node, or NULL on error
*/ */
void *ecore_dlist_previous(Ecore_DList * list) EAPI void *ecore_dlist_previous(Ecore_DList * list)
{ {
void *data; void *data;
@ -1475,7 +1475,7 @@ static void *_ecore_dlist_previous(Ecore_DList * list)
* *
* @return Returns TRUE on success, FALSE on errors * @return Returns TRUE on success, FALSE on errors
*/ */
int ecore_dlist_clear(Ecore_DList * list) EAPI int ecore_dlist_clear(Ecore_DList * list)
{ {
CHECK_PARAM_POINTER_RETURN("list", list, FALSE); CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@ -1489,7 +1489,7 @@ int ecore_dlist_clear(Ecore_DList * list)
* @param node: the node to initialize * @param node: the node to initialize
* @return Returns TRUE on success, FALSE on errors * @return Returns TRUE on success, FALSE on errors
*/ */
int ecore_dlist_node_init(Ecore_DList_Node * node) EAPI int ecore_dlist_node_init(Ecore_DList_Node * node)
{ {
int ret; int ret;
@ -1506,7 +1506,7 @@ int ecore_dlist_node_init(Ecore_DList_Node * node)
* @brief Allocate and initialize a new list node * @brief Allocate and initialize a new list node
* @return Returns NULL on error, new list node on success * @return Returns NULL on error, new list node on success
*/ */
Ecore_DList_Node *ecore_dlist_node_new() EAPI Ecore_DList_Node *ecore_dlist_node_new()
{ {
Ecore_DList_Node *new_node; Ecore_DList_Node *new_node;
@ -1529,7 +1529,7 @@ Ecore_DList_Node *ecore_dlist_node_new()
* @param free_func: the callback function to execute on the data * @param free_func: the callback function to execute on the data
* @return Returns TRUE on success, FALSE on error * @return Returns TRUE on success, FALSE on error
*/ */
int ecore_dlist_node_destroy(Ecore_DList_Node * node, Ecore_Free_Cb free_func) EAPI int ecore_dlist_node_destroy(Ecore_DList_Node * node, Ecore_Free_Cb free_func)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, CHECK_PARAM_POINTER_RETURN("node", node,
FALSE); FALSE);

View File

@ -60,7 +60,7 @@ static double t2 = 0.0;
* queue. * queue.
* @ingroup Ecore_Main_Loop_Group * @ingroup Ecore_Main_Loop_Group
*/ */
void EAPI void
ecore_main_loop_iterate(void) ecore_main_loop_iterate(void)
{ {
_ecore_main_loop_iterate_internal(1); _ecore_main_loop_iterate_internal(1);
@ -73,7 +73,7 @@ ecore_main_loop_iterate(void)
* *
* @ingroup Ecore_Main_Loop_Group * @ingroup Ecore_Main_Loop_Group
*/ */
void EAPI void
ecore_main_loop_begin(void) ecore_main_loop_begin(void)
{ {
in_main_loop++; in_main_loop++;
@ -87,7 +87,7 @@ ecore_main_loop_begin(void)
* been processed. * been processed.
* @ingroup Ecore_Main_Loop_Group * @ingroup Ecore_Main_Loop_Group
*/ */
void EAPI void
ecore_main_loop_quit(void) ecore_main_loop_quit(void)
{ {
do_quit = 1; do_quit = 1;
@ -130,7 +130,7 @@ ecore_main_loop_quit(void)
* @return A fd handler handle if successful. @c NULL otherwise. * @return A fd handler handle if successful. @c NULL otherwise.
* @ingroup Ecore_FD_Handler_Group * @ingroup Ecore_FD_Handler_Group
*/ */
Ecore_Fd_Handler * EAPI Ecore_Fd_Handler *
ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data, int (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data) ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data, int (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data)
{ {
Ecore_Fd_Handler *fdh; Ecore_Fd_Handler *fdh;
@ -162,7 +162,7 @@ ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func) (voi
* for @p fd_handler on success. @c NULL otherwise. * for @p fd_handler on success. @c NULL otherwise.
* @ingroup Ecore_FD_Handler_Group * @ingroup Ecore_FD_Handler_Group
*/ */
void * EAPI void *
ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler) ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
{ {
if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER)) if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER))
@ -176,7 +176,7 @@ ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
return fd_handler->data; return fd_handler->data;
} }
void EAPI void
ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, void (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data) ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, void (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data)
{ {
if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER)) if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER))
@ -195,7 +195,7 @@ ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, void (*
* @return The file descriptor the handler is watching. * @return The file descriptor the handler is watching.
* @ingroup Ecore_FD_Handler_Group * @ingroup Ecore_FD_Handler_Group
*/ */
int EAPI int
ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler) ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler)
{ {
if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER)) if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER))
@ -216,7 +216,7 @@ ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler)
* @return @c 1 if any of the given flags are active. @c 0 otherwise. * @return @c 1 if any of the given flags are active. @c 0 otherwise.
* @ingroup Ecore_FD_Handler_Group * @ingroup Ecore_FD_Handler_Group
*/ */
int EAPI int
ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags) ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags)
{ {
int ret; int ret;
@ -240,7 +240,7 @@ ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_
* @param flags The flags to be watching. * @param flags The flags to be watching.
* @ingroup Ecore_FD_Handler_Group * @ingroup Ecore_FD_Handler_Group
*/ */
void EAPI void
ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags) ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags)
{ {
if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER)) if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER))

View File

@ -20,7 +20,7 @@ Ecore_Path_Group *__ecore_path_group_find_id(int id);
* @return @c 0 on error, the integer id of the new group on success. * @return @c 0 on error, the integer id of the new group on success.
* @ingroup Ecore_Path_Group * @ingroup Ecore_Path_Group
*/ */
int EAPI int
ecore_path_group_new(char *group_name) ecore_path_group_new(char *group_name)
{ {
Ecore_Path_Group *last; Ecore_Path_Group *last;
@ -54,7 +54,7 @@ ecore_path_group_new(char *group_name)
* @param group_id The unique identifier for the group. * @param group_id The unique identifier for the group.
* @ingroup Ecore_Path_Group * @ingroup Ecore_Path_Group
*/ */
void EAPI void
ecore_path_group_del(int group_id) ecore_path_group_del(int group_id)
{ {
Ecore_Path_Group *group; Ecore_Path_Group *group;
@ -80,7 +80,7 @@ ecore_path_group_del(int group_id)
* @param path The new path to be added to the group. * @param path The new path to be added to the group.
* @ingroup Ecore_Path_Group * @ingroup Ecore_Path_Group
*/ */
void EAPI void
ecore_path_group_add(int group_id, char *path) ecore_path_group_add(int group_id, char *path)
{ {
Ecore_Path_Group *group; Ecore_Path_Group *group;
@ -104,7 +104,7 @@ ecore_path_group_add(int group_id, char *path)
* @param path The path of the directory to be removed. * @param path The path of the directory to be removed.
* @ingroup Ecore_Path_Group * @ingroup Ecore_Path_Group
*/ */
void EAPI void
ecore_path_group_remove(int group_id, char *path) ecore_path_group_remove(int group_id, char *path)
{ {
char *found; char *found;
@ -143,7 +143,7 @@ ecore_path_group_remove(int group_id, char *path)
* on success. @c NULL on failure. * on success. @c NULL on failure.
* @ingroup Ecore_Path_Group * @ingroup Ecore_Path_Group
*/ */
char * EAPI char *
ecore_path_group_find(int group_id, char *name) ecore_path_group_find(int group_id, char *name)
{ {
int r; int r;
@ -180,7 +180,7 @@ ecore_path_group_find(int group_id, char *name)
* identified by @p group_id. @c NULL otherwise. * identified by @p group_id. @c NULL otherwise.
* @ingroup Ecore_Path_Group * @ingroup Ecore_Path_Group
*/ */
Ecore_List * EAPI Ecore_List *
ecore_path_group_available(int group_id) ecore_path_group_available(int group_id)
{ {
Ecore_List *avail = NULL; Ecore_List *avail = NULL;

View File

@ -19,7 +19,7 @@ static Ecore_List *loaded_plugins = NULL;
* failure. * failure.
* @ingroup Ecore_Plugin * @ingroup Ecore_Plugin
*/ */
Ecore_Plugin * EAPI Ecore_Plugin *
ecore_plugin_load(int group_id, char *plugin_name) ecore_plugin_load(int group_id, char *plugin_name)
{ {
char *path; char *path;
@ -67,7 +67,7 @@ ecore_plugin_load(int group_id, char *plugin_name)
* @param plugin The given plugin. * @param plugin The given plugin.
* @ingroup Ecore_Plugin * @ingroup Ecore_Plugin
*/ */
void EAPI void
ecore_plugin_unload(Ecore_Plugin * plugin) ecore_plugin_unload(Ecore_Plugin * plugin)
{ {
CHECK_PARAM_POINTER("plugin", plugin); CHECK_PARAM_POINTER("plugin", plugin);
@ -91,7 +91,7 @@ ecore_plugin_unload(Ecore_Plugin * plugin)
* @return Address of the given symbol if successful. Otherwise, @c NULL. * @return Address of the given symbol if successful. Otherwise, @c NULL.
* @ingroup Ecore_Plugin * @ingroup Ecore_Plugin
*/ */
void * EAPI void *
ecore_plugin_call(Ecore_Plugin * plugin, char *symbol_name) ecore_plugin_call(Ecore_Plugin * plugin, char *symbol_name)
{ {
void *ret; void *ret;

View File

@ -18,7 +18,7 @@ static void _ecore_sheap_update_data(Ecore_Sheap *heap);
* @return A pointer to the newly allocated binary heap on success, NULL on * @return A pointer to the newly allocated binary heap on success, NULL on
* failure. * failure.
*/ */
Ecore_Sheap *ecore_sheap_new(Ecore_Compare_Cb compare, int size) EAPI Ecore_Sheap *ecore_sheap_new(Ecore_Compare_Cb compare, int size)
{ {
Ecore_Sheap *heap = NULL; Ecore_Sheap *heap = NULL;
@ -42,7 +42,7 @@ Ecore_Sheap *ecore_sheap_new(Ecore_Compare_Cb compare, int size)
* @param size The number of elements to allow in the heap * @param size The number of elements to allow in the heap
* @return TRUE on success, FALSE on failure * @return TRUE on success, FALSE on failure
*/ */
int ecore_sheap_init(Ecore_Sheap *heap, Ecore_Compare_Cb compare, int size) EAPI int ecore_sheap_init(Ecore_Sheap *heap, Ecore_Compare_Cb compare, int size)
{ {
CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE); CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
@ -69,7 +69,7 @@ int ecore_sheap_init(Ecore_Sheap *heap, Ecore_Compare_Cb compare, int size)
* *
* @param heap The heap to be freed * @param heap The heap to be freed
*/ */
void ecore_sheap_destroy(Ecore_Sheap *heap) EAPI void ecore_sheap_destroy(Ecore_Sheap *heap)
{ {
int i; int i;
@ -94,7 +94,7 @@ void ecore_sheap_destroy(Ecore_Sheap *heap)
* @param free_func The function that will free the key data. * @param free_func The function that will free the key data.
* @return @c TRUE on successful set, @c FALSE otherwise. * @return @c TRUE on successful set, @c FALSE otherwise.
*/ */
int ecore_sheap_set_free_cb(Ecore_Sheap *heap, Ecore_Free_Cb free_func) EAPI int ecore_sheap_set_free_cb(Ecore_Sheap *heap, Ecore_Free_Cb free_func)
{ {
CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE); CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
@ -110,7 +110,7 @@ int ecore_sheap_set_free_cb(Ecore_Sheap *heap, Ecore_Free_Cb free_func)
* @return TRUE on success, NULL on failure. Increases the size of the heap if * @return TRUE on success, NULL on failure. Increases the size of the heap if
* it becomes larger than available space. * it becomes larger than available space.
*/ */
int ecore_sheap_insert(Ecore_Sheap *heap, void *data) EAPI int ecore_sheap_insert(Ecore_Sheap *heap, void *data)
{ {
int i; int i;
void *temp; void *temp;
@ -198,7 +198,7 @@ int ecore_sheap_insert(Ecore_Sheap *heap, void *data)
* @note The extract function maintains the heap properties after the * @note The extract function maintains the heap properties after the
* extract. * extract.
*/ */
void *ecore_sheap_extract(Ecore_Sheap *heap) EAPI void *ecore_sheap_extract(Ecore_Sheap *heap)
{ {
void *extreme; void *extreme;
@ -222,7 +222,7 @@ void *ecore_sheap_extract(Ecore_Sheap *heap)
* @return The top item of the heap on success, NULL on failure. * @return The top item of the heap on success, NULL on failure.
* @note The function does not alter the heap. * @note The function does not alter the heap.
*/ */
void *ecore_sheap_extreme(Ecore_Sheap *heap) EAPI void *ecore_sheap_extreme(Ecore_Sheap *heap)
{ {
if (heap->size < 1) if (heap->size < 1)
return NULL; return NULL;
@ -239,7 +239,7 @@ void *ecore_sheap_extreme(Ecore_Sheap *heap)
* @note The heap does not free the old data since it must be passed * @note The heap does not free the old data since it must be passed
* in, so the caller can perform the free if desired. * in, so the caller can perform the free if desired.
*/ */
int ecore_sheap_change(Ecore_Sheap *heap, void *item, void *newval) EAPI int ecore_sheap_change(Ecore_Sheap *heap, void *item, void *newval)
{ {
int i; int i;
@ -269,7 +269,7 @@ int ecore_sheap_change(Ecore_Sheap *heap, void *item, void *newval)
* The comparison function is changed to @compare and the heap is heapified * The comparison function is changed to @compare and the heap is heapified
* by the new comparison. * by the new comparison.
*/ */
int ecore_sheap_set_compare(Ecore_Sheap *heap, Ecore_Compare_Cb compare) EAPI int ecore_sheap_set_compare(Ecore_Sheap *heap, Ecore_Compare_Cb compare)
{ {
CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE); CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
@ -291,7 +291,7 @@ int ecore_sheap_set_compare(Ecore_Sheap *heap, Ecore_Compare_Cb compare)
* Changes the heap order of @heap and re-heapifies the data to this new * Changes the heap order of @heap and re-heapifies the data to this new
* order. The default order is a min heap. * order. The default order is a min heap.
*/ */
void ecore_sheap_set_order(Ecore_Sheap *heap, char order) EAPI void ecore_sheap_set_order(Ecore_Sheap *heap, char order)
{ {
CHECK_PARAM_POINTER("heap", heap); CHECK_PARAM_POINTER("heap", heap);
@ -307,7 +307,7 @@ void ecore_sheap_set_order(Ecore_Sheap *heap, char order)
* Sorts the data in the heap into the order that is used for the heap's * Sorts the data in the heap into the order that is used for the heap's
* data. * data.
*/ */
void ecore_sheap_sort(Ecore_Sheap *heap) EAPI void ecore_sheap_sort(Ecore_Sheap *heap)
{ {
int i = 0; int i = 0;
void **new_data; void **new_data;
@ -340,7 +340,7 @@ void ecore_sheap_sort(Ecore_Sheap *heap)
* NULL on failure. * NULL on failure.
* @note The data is guaranteed to be in sorted order. * @note The data is guaranteed to be in sorted order.
*/ */
inline void *ecore_sheap_item(Ecore_Sheap *heap, int i) EAPI inline void *ecore_sheap_item(Ecore_Sheap *heap, int i)
{ {
if (i >= heap->size) if (i >= heap->size)
return NULL; return NULL;

View File

@ -17,7 +17,7 @@ static int ecore_string_init_count = 0;
* Initialize the ecore string internal structure. * Initialize the ecore string internal structure.
* @return Zero on failure, non-zero on successful initialization. * @return Zero on failure, non-zero on successful initialization.
*/ */
int ecore_string_init() EAPI int ecore_string_init()
{ {
/* /*
* No strings have been loaded at this point, so create the hash * No strings have been loaded at this point, so create the hash
@ -41,7 +41,7 @@ int ecore_string_init()
* @c NULL on failure. * @c NULL on failure.
* @ingroup Ecore_String_Group * @ingroup Ecore_String_Group
*/ */
const char *ecore_string_instance(char *string) EAPI const char *ecore_string_instance(char *string)
{ {
Ecore_String *str; Ecore_String *str;
@ -78,7 +78,7 @@ const char *ecore_string_instance(char *string)
* @param string The given string. * @param string The given string.
* @ingroup Ecore_String_Group * @ingroup Ecore_String_Group
*/ */
void ecore_string_release(const char *string) EAPI void ecore_string_release(const char *string)
{ {
Ecore_String *str; Ecore_String *str;
@ -99,7 +99,7 @@ void ecore_string_release(const char *string)
/** /**
* Shutdown the ecore string internal structures * Shutdown the ecore string internal structures
*/ */
void ecore_string_shutdown() EAPI void ecore_string_shutdown()
{ {
--ecore_string_init_count; --ecore_string_init_count;
if (!ecore_string_init_count) { if (!ecore_string_init_count) {

View File

@ -32,7 +32,7 @@ gettimeofday(struct timeval *tv, void *unused)
* @return The number of seconds since 12.00AM 1st January 1970. * @return The number of seconds since 12.00AM 1st January 1970.
* @ingroup Ecore_Time_Group * @ingroup Ecore_Time_Group
*/ */
double EAPI double
ecore_time_get(void) ecore_time_get(void)
{ {
struct timeval timev; struct timeval timev;

View File

@ -24,7 +24,7 @@ static double last_check = 0.0;
* @return A timer object on success. @c NULL on failure. * @return A timer object on success. @c NULL on failure.
* @ingroup Ecore_Time_Group * @ingroup Ecore_Time_Group
*/ */
Ecore_Timer * EAPI Ecore_Timer *
ecore_timer_add(double in, int (*func) (void *data), const void *data) ecore_timer_add(double in, int (*func) (void *data), const void *data)
{ {
double now; double now;
@ -47,7 +47,7 @@ ecore_timer_add(double in, int (*func) (void *data), const void *data)
* called. @c NULL is returned if the function is unsuccessful. * called. @c NULL is returned if the function is unsuccessful.
* @ingroup Ecore_Time_Group * @ingroup Ecore_Time_Group
*/ */
void * EAPI void *
ecore_timer_del(Ecore_Timer *timer) ecore_timer_del(Ecore_Timer *timer)
{ {
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER))
@ -70,7 +70,7 @@ ecore_timer_del(Ecore_Timer *timer)
* @param in The interval in seconds. * @param in The interval in seconds.
* @ingroup Ecore_Time_Group * @ingroup Ecore_Time_Group
*/ */
void EAPI void
ecore_timer_interval_set(Ecore_Timer *timer, double in) ecore_timer_interval_set(Ecore_Timer *timer, double in)
{ {
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER))

View File

@ -7,19 +7,19 @@
/* Utility functions for searching the tree and returning a node, or its /* Utility functions for searching the tree and returning a node, or its
* parent */ * parent */
Ecore_Tree_Node *tree_node_find(Ecore_Tree * tree, void *key); static Ecore_Tree_Node *tree_node_find(Ecore_Tree * tree, void *key);
Ecore_Tree_Node *tree_node_find_parent(Ecore_Tree * tree, void *key); static Ecore_Tree_Node *tree_node_find_parent(Ecore_Tree * tree, void *key);
/* Balancing functions, keep the tree balanced within a one node height /* Balancing functions, keep the tree balanced within a one node height
* difference */ * difference */
int tree_node_balance(Ecore_Tree * Tree, Ecore_Tree_Node * top_node); static int tree_node_balance(Ecore_Tree * Tree, Ecore_Tree_Node * top_node);
int tree_node_rotate_right(Ecore_Tree * tree, Ecore_Tree_Node * top_node); static int tree_node_rotate_right(Ecore_Tree * tree, Ecore_Tree_Node * top_node);
int tree_node_rotate_left(Ecore_Tree * tree, Ecore_Tree_Node * top_node); static int tree_node_rotate_left(Ecore_Tree * tree, Ecore_Tree_Node * top_node);
/* Fucntions for executing a specified function on each node of a tree */ /* Fucntions for executing a specified function on each node of a tree */
int tree_for_each_node(Ecore_Tree_Node * node, Ecore_For_Each for_each_func, static int tree_for_each_node(Ecore_Tree_Node * node, Ecore_For_Each for_each_func,
void *user_data); void *user_data);
int tree_for_each_node_value(Ecore_Tree_Node * node, static int tree_for_each_node_value(Ecore_Tree_Node * node,
Ecore_For_Each for_each_func, void *user_data); Ecore_For_Each for_each_func, void *user_data);
/** /**
@ -27,7 +27,7 @@ int tree_for_each_node_value(Ecore_Tree_Node * node,
* @param compare_func: function used to compare the two values * @param compare_func: function used to compare the two values
* @return Returns NULL if the operation fails, otherwise the new tree * @return Returns NULL if the operation fails, otherwise the new tree
*/ */
Ecore_Tree *ecore_tree_new(Ecore_Compare_Cb compare_func) EAPI Ecore_Tree *ecore_tree_new(Ecore_Compare_Cb compare_func)
{ {
Ecore_Tree *new_tree; Ecore_Tree *new_tree;
@ -49,7 +49,7 @@ Ecore_Tree *ecore_tree_new(Ecore_Compare_Cb compare_func)
* @param compare_func: the function used to compare node keys * @param compare_func: the function used to compare node keys
* @return Returns TRUE on successful initialization, FALSE on an error * @return Returns TRUE on successful initialization, FALSE on an error
*/ */
int ecore_tree_init(Ecore_Tree * new_tree, Ecore_Compare_Cb compare_func) EAPI int ecore_tree_init(Ecore_Tree * new_tree, Ecore_Compare_Cb compare_func)
{ {
CHECK_PARAM_POINTER_RETURN("new_tree", new_tree, FALSE); CHECK_PARAM_POINTER_RETURN("new_tree", new_tree, FALSE);
@ -71,7 +71,7 @@ int ecore_tree_init(Ecore_Tree * new_tree, Ecore_Compare_Cb compare_func)
* @param free_func: the function that will be passed the node being freed * @param free_func: the function that will be passed the node being freed
* @return Returns TRUE on successful set, FALSE otherwise. * @return Returns TRUE on successful set, FALSE otherwise.
*/ */
int ecore_tree_set_free_cb(Ecore_Tree * tree, Ecore_Free_Cb free_func) EAPI int ecore_tree_set_free_cb(Ecore_Tree * tree, Ecore_Free_Cb free_func)
{ {
CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE); CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
@ -86,7 +86,7 @@ int ecore_tree_set_free_cb(Ecore_Tree * tree, Ecore_Free_Cb free_func)
* @brief Initialize a new tree node * @brief Initialize a new tree node
* @return Returns FALSE if the operation fails, otherwise TRUE * @return Returns FALSE if the operation fails, otherwise TRUE
*/ */
int ecore_tree_node_init(Ecore_Tree_Node * new_node) EAPI int ecore_tree_node_init(Ecore_Tree_Node * new_node)
{ {
CHECK_PARAM_POINTER_RETURN("new_node", new_node, FALSE); CHECK_PARAM_POINTER_RETURN("new_node", new_node, FALSE);
@ -108,7 +108,7 @@ int ecore_tree_node_init(Ecore_Tree_Node * new_node)
* @brief Allocate a new tree node * @brief Allocate a new tree node
* @return Returns NULL if the operation fails, otherwise the new node. * @return Returns NULL if the operation fails, otherwise the new node.
*/ */
Ecore_Tree_Node *ecore_tree_node_new() EAPI Ecore_Tree_Node *ecore_tree_node_new()
{ {
Ecore_Tree_Node *new_node; Ecore_Tree_Node *new_node;
@ -132,7 +132,7 @@ Ecore_Tree_Node *ecore_tree_node_new()
* *
* If you don't want the children free'd then you need to remove the node first. * If you don't want the children free'd then you need to remove the node first.
*/ */
int ecore_tree_node_destroy(Ecore_Tree_Node * node, Ecore_Free_Cb data_free) EAPI int ecore_tree_node_destroy(Ecore_Tree_Node * node, Ecore_Free_Cb data_free)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, FALSE); CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
@ -154,7 +154,7 @@ int ecore_tree_node_destroy(Ecore_Tree_Node * node, Ecore_Free_Cb data_free)
* @param value: the value to set the node to. * @param value: the value to set the node to.
* @return Returns TRUE if the node is set successfully, FALSE if not. * @return Returns TRUE if the node is set successfully, FALSE if not.
*/ */
int ecore_tree_node_value_set(Ecore_Tree_Node * node, void *value) EAPI int ecore_tree_node_value_set(Ecore_Tree_Node * node, void *value)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, CHECK_PARAM_POINTER_RETURN("node", node,
FALSE); FALSE);
@ -171,7 +171,7 @@ int ecore_tree_node_value_set(Ecore_Tree_Node * node, void *value)
* @param node: the node that contains the desired value * @param node: the node that contains the desired value
* @return Returns NULL if an error, otherwise the value associated with node * @return Returns NULL if an error, otherwise the value associated with node
*/ */
void *ecore_tree_node_value_get(Ecore_Tree_Node * node) EAPI void *ecore_tree_node_value_get(Ecore_Tree_Node * node)
{ {
void *ret; void *ret;
@ -189,7 +189,7 @@ void *ecore_tree_node_value_get(Ecore_Tree_Node * node)
* @param key: the value to set it's key to. * @param key: the value to set it's key to.
* @return Returns TRUE if the node is set successfully, FALSE if not. * @return Returns TRUE if the node is set successfully, FALSE if not.
*/ */
int ecore_tree_node_key_set(Ecore_Tree_Node * node, void *key) EAPI int ecore_tree_node_key_set(Ecore_Tree_Node * node, void *key)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, FALSE); CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
@ -206,7 +206,7 @@ int ecore_tree_node_key_set(Ecore_Tree_Node * node, void *key)
* *
* @return Returns NULL if an error occurs, otherwise the key is returned * @return Returns NULL if an error occurs, otherwise the key is returned
*/ */
void *ecore_tree_node_key_get(Ecore_Tree_Node * node) EAPI void *ecore_tree_node_key_get(Ecore_Tree_Node * node)
{ {
void *ret; void *ret;
@ -224,7 +224,7 @@ void *ecore_tree_node_key_get(Ecore_Tree_Node * node)
* *
* @return Returns TRUE if tree destroyed successfully, FALSE if not. * @return Returns TRUE if tree destroyed successfully, FALSE if not.
*/ */
int ecore_tree_destroy(Ecore_Tree * tree) EAPI int ecore_tree_destroy(Ecore_Tree * tree)
{ {
Ecore_Tree_Node *node; Ecore_Tree_Node *node;
@ -250,7 +250,7 @@ int ecore_tree_destroy(Ecore_Tree * tree)
* *
* @return Returns the node corresponding to the key if found, otherwise NULL. * @return Returns the node corresponding to the key if found, otherwise NULL.
*/ */
Ecore_Tree_Node *ecore_tree_get_node(Ecore_Tree * tree, void *key) EAPI Ecore_Tree_Node *ecore_tree_get_node(Ecore_Tree * tree, void *key)
{ {
Ecore_Tree_Node *ret; Ecore_Tree_Node *ret;
@ -269,7 +269,7 @@ Ecore_Tree_Node *ecore_tree_get_node(Ecore_Tree * tree, void *key)
* @param key: the key to search for in @a tree * @param key: the key to search for in @a tree
* @return Returns the value corresponding to the key if found, otherwise NULL. * @return Returns the value corresponding to the key if found, otherwise NULL.
*/ */
void *ecore_tree_get(Ecore_Tree * tree, void *key) EAPI void *ecore_tree_get(Ecore_Tree * tree, void *key)
{ {
void *ret; void *ret;
Ecore_Tree_Node *node; Ecore_Tree_Node *node;
@ -294,7 +294,7 @@ void *ecore_tree_get(Ecore_Tree * tree, void *key)
* @return NULL if no valid nodes, otherwise the node greater than or * @return NULL if no valid nodes, otherwise the node greater than or
* equal to the key * equal to the key
*/ */
void *ecore_tree_get_closest_larger(Ecore_Tree * tree, void *key) EAPI void *ecore_tree_get_closest_larger(Ecore_Tree * tree, void *key)
{ {
Ecore_Tree_Node *node; Ecore_Tree_Node *node;
@ -330,7 +330,7 @@ void *ecore_tree_get_closest_larger(Ecore_Tree * tree, void *key)
* @param key the key to search for in tree * @param key the key to search for in tree
* @return Returns NULL if no valid nodes, otherwise the node <= key * @return Returns NULL if no valid nodes, otherwise the node <= key
*/ */
void *ecore_tree_get_closest_smaller(Ecore_Tree * tree, void *key) EAPI void *ecore_tree_get_closest_smaller(Ecore_Tree * tree, void *key)
{ {
Ecore_Tree_Node *node; Ecore_Tree_Node *node;
@ -360,7 +360,7 @@ void *ecore_tree_get_closest_smaller(Ecore_Tree * tree, void *key)
* @param value Value to set the found node. * @param value Value to set the found node.
* @return TRUE if successful, FALSE if not. * @return TRUE if successful, FALSE if not.
*/ */
int ecore_tree_set(Ecore_Tree * tree, void *key, void *value) EAPI int ecore_tree_set(Ecore_Tree * tree, void *key, void *value)
{ {
Ecore_Tree_Node *node = NULL; Ecore_Tree_Node *node = NULL;
@ -392,7 +392,7 @@ int ecore_tree_set(Ecore_Tree * tree, void *key, void *value)
* @param node The node to add to @a tree. * @param node The node to add to @a tree.
* @return TRUE on a successful add, FALSE otherwise. * @return TRUE on a successful add, FALSE otherwise.
*/ */
int ecore_tree_add_node(Ecore_Tree * tree, Ecore_Tree_Node * node) EAPI int ecore_tree_add_node(Ecore_Tree * tree, Ecore_Tree_Node * node)
{ {
Ecore_Tree_Node *travel = NULL; Ecore_Tree_Node *travel = NULL;
@ -427,7 +427,7 @@ int ecore_tree_add_node(Ecore_Tree * tree, Ecore_Tree_Node * node)
* @param node The node to remove from @a tree. * @param node The node to remove from @a tree.
* @return TRUE on a successful remove, FALSE otherwise. * @return TRUE on a successful remove, FALSE otherwise.
*/ */
int ecore_tree_remove_node(Ecore_Tree * tree, Ecore_Tree_Node * node) EAPI int ecore_tree_remove_node(Ecore_Tree * tree, Ecore_Tree_Node * node)
{ {
Ecore_Tree_Node *traverse; Ecore_Tree_Node *traverse;
@ -535,7 +535,7 @@ int ecore_tree_remove_node(Ecore_Tree * tree, Ecore_Tree_Node * node)
* @param key The key to remove from @a tree. * @param key The key to remove from @a tree.
* @return TRUE on a successful remove, FALSE otherwise. * @return TRUE on a successful remove, FALSE otherwise.
*/ */
int ecore_tree_remove(Ecore_Tree * tree, void *key) EAPI int ecore_tree_remove(Ecore_Tree * tree, void *key)
{ {
Ecore_Tree_Node *node; Ecore_Tree_Node *node;
@ -561,7 +561,7 @@ int ecore_tree_remove(Ecore_Tree * tree, void *key)
* @param tree: the tree to check for nodes * @param tree: the tree to check for nodes
* @return Returns TRUE if no nodes exist, FALSE otherwise * @return Returns TRUE if no nodes exist, FALSE otherwise
*/ */
int ecore_tree_is_empty(Ecore_Tree * tree) EAPI int ecore_tree_is_empty(Ecore_Tree * tree)
{ {
CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE); CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
@ -578,7 +578,7 @@ int ecore_tree_is_empty(Ecore_Tree * tree)
* @param user_data: data passed to each for_each_func call * @param user_data: data passed to each for_each_func call
* @return Returns TRUE on success, FALSE on failure. * @return Returns TRUE on success, FALSE on failure.
*/ */
int ecore_tree_for_each_node_value(Ecore_Tree * tree, EAPI int ecore_tree_for_each_node_value(Ecore_Tree * tree,
Ecore_For_Each for_each_func, void *user_data) Ecore_For_Each for_each_func, void *user_data)
{ {
CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE); CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
@ -597,7 +597,7 @@ int ecore_tree_for_each_node_value(Ecore_Tree * tree,
* @param user_data: data passed to each for_each_func call * @param user_data: data passed to each for_each_func call
* @return Returns TRUE on success, FALSE on failure. * @return Returns TRUE on success, FALSE on failure.
*/ */
int ecore_tree_for_each_node(Ecore_Tree * tree, Ecore_For_Each for_each_func, EAPI int ecore_tree_for_each_node(Ecore_Tree * tree, Ecore_For_Each for_each_func,
void *user_data) void *user_data)
{ {
CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE); CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
@ -610,7 +610,7 @@ int ecore_tree_for_each_node(Ecore_Tree * tree, Ecore_For_Each for_each_func,
} }
/* Find the parent for the key */ /* Find the parent for the key */
Ecore_Tree_Node *tree_node_find_parent(Ecore_Tree * tree, void *key) static Ecore_Tree_Node *tree_node_find_parent(Ecore_Tree * tree, void *key)
{ {
Ecore_Tree_Node *parent, *travel; Ecore_Tree_Node *parent, *travel;
@ -642,7 +642,7 @@ Ecore_Tree_Node *tree_node_find_parent(Ecore_Tree * tree, void *key)
} }
/* Search for the node with a specified key */ /* Search for the node with a specified key */
Ecore_Tree_Node *tree_node_find(Ecore_Tree * tree, void *key) static Ecore_Tree_Node *tree_node_find(Ecore_Tree * tree, void *key)
{ {
int compare; int compare;
Ecore_Tree_Node *node; Ecore_Tree_Node *node;
@ -671,7 +671,7 @@ Ecore_Tree_Node *tree_node_find(Ecore_Tree * tree, void *key)
} }
/* Balance the tree with respect to node */ /* Balance the tree with respect to node */
int tree_node_balance(Ecore_Tree * tree, Ecore_Tree_Node * top_node) static int tree_node_balance(Ecore_Tree * tree, Ecore_Tree_Node * top_node)
{ {
int balance; int balance;
@ -703,7 +703,7 @@ int tree_node_balance(Ecore_Tree * tree, Ecore_Tree_Node * top_node)
} }
/* Tree is overbalanced to the left, so rotate nodes to the right. */ /* Tree is overbalanced to the left, so rotate nodes to the right. */
int tree_node_rotate_right(Ecore_Tree * tree, Ecore_Tree_Node * top_node) static int tree_node_rotate_right(Ecore_Tree * tree, Ecore_Tree_Node * top_node)
{ {
Ecore_Tree_Node *temp; Ecore_Tree_Node *temp;
@ -737,7 +737,7 @@ int tree_node_rotate_right(Ecore_Tree * tree, Ecore_Tree_Node * top_node)
} }
/* The tree is overbalanced to the right, so we rotate nodes to the left */ /* The tree is overbalanced to the right, so we rotate nodes to the left */
int tree_node_rotate_left(Ecore_Tree * tree, Ecore_Tree_Node * top_node) static int tree_node_rotate_left(Ecore_Tree * tree, Ecore_Tree_Node * top_node)
{ {
Ecore_Tree_Node *temp; Ecore_Tree_Node *temp;
@ -778,7 +778,7 @@ int tree_node_rotate_left(Ecore_Tree * tree, Ecore_Tree_Node * top_node)
* @param user_data: data passed to each for_each_func call * @param user_data: data passed to each for_each_func call
* @return Returns FALSE if an error condition occurs, otherwise TRUE * @return Returns FALSE if an error condition occurs, otherwise TRUE
*/ */
int tree_for_each_node(Ecore_Tree_Node * node, Ecore_For_Each for_each_func, static int tree_for_each_node(Ecore_Tree_Node * node, Ecore_For_Each for_each_func,
void *user_data) void *user_data)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, FALSE); CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
@ -801,7 +801,7 @@ int tree_for_each_node(Ecore_Tree_Node * node, Ecore_For_Each for_each_func,
* @param for_each_func: the function to pass the nodes values as data * @param for_each_func: the function to pass the nodes values as data
* @return Returns FALSE if an error condition occurs, otherwise TRUE * @return Returns FALSE if an error condition occurs, otherwise TRUE
*/ */
int tree_for_each_node_value(Ecore_Tree_Node * node, static int tree_for_each_node_value(Ecore_Tree_Node * node,
Ecore_For_Each for_each_func, void *user_data) Ecore_For_Each for_each_func, void *user_data)
{ {
CHECK_PARAM_POINTER_RETURN("node", node, FALSE); CHECK_PARAM_POINTER_RETURN("node", node, FALSE);

View File

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "Ecore_Data.h" #include "Ecore_Data.h"
#include "ecore_private.h" #include "ecore_private.h"
const unsigned int ecore_prime_table[] = { 17, 31, 61, 127, 257, 509, 1021, EAPI const unsigned int ecore_prime_table[] = { 17, 31, 61, 127, 257, 509, 1021,
2053, 4093, 8191, 16381, 32771, 65537, 131071, 262147, 524287, 1048573, 2053, 4093, 8191, 16381, 32771, 65537, 131071, 262147, 524287, 1048573,
2097143, 4194301, 8388617, 16777213 2097143, 4194301, 8388617, 16777213
}; };
@ -49,7 +49,7 @@ inline void ecore_print_warning(const char *function, const char *sparam)
* @param key The key to return compute a hash value * @param key The key to return compute a hash value
* @return The key cast to an unsigned int. * @return The key cast to an unsigned int.
*/ */
unsigned int ecore_direct_hash(void *key) EAPI unsigned int ecore_direct_hash(void *key)
{ {
return ((unsigned int) key); return ((unsigned int) key);
} }
@ -59,7 +59,7 @@ unsigned int ecore_direct_hash(void *key)
* @param key A pointer to the string to compute a hash value * @param key A pointer to the string to compute a hash value
* @return A computed hash value for @a key. * @return A computed hash value for @a key.
*/ */
unsigned int ecore_str_hash(void *key) EAPI unsigned int ecore_str_hash(void *key)
{ {
int i; int i;
unsigned int value = 0; unsigned int value = 0;
@ -82,7 +82,7 @@ unsigned int ecore_str_hash(void *key)
* @param key2 The second key to compare * @param key2 The second key to compare
* @return A strcmp style value to indicate the larger key * @return A strcmp style value to indicate the larger key
*/ */
int ecore_direct_compare(void *key1, void *key2) EAPI int ecore_direct_compare(void *key1, void *key2)
{ {
unsigned int k1, k2; unsigned int k1, k2;
@ -104,7 +104,7 @@ int ecore_direct_compare(void *key1, void *key2)
* @param key2 The second key to compare * @param key2 The second key to compare
* @return A strcmp style value to indicate the larger key * @return A strcmp style value to indicate the larger key
*/ */
int ecore_str_compare(void *key1, void *key2) EAPI int ecore_str_compare(void *key1, void *key2)
{ {
char *k1, *k2; char *k1, *k2;

View File

@ -2,17 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/ */
#include "Ecore.h"
#include "ecore_private.h"
#include "ecore_con_private.h"
#include "Ecore_Con.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#elif WIN32
#include <winsock.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -24,6 +13,17 @@
#include <time.h> #include <time.h>
#endif #endif
#include "Ecore.h"
#include "ecore_private.h"
#include "ecore_con_private.h"
#include "Ecore_Con.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#elif WIN32
#include <winsock.h>
#endif
static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he); static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he);
static void _ecore_con_server_free(Ecore_Con_Server *svr); static void _ecore_con_server_free(Ecore_Con_Server *svr);
static void _ecore_con_client_free(Ecore_Con_Client *cl); static void _ecore_con_client_free(Ecore_Con_Client *cl);
@ -35,12 +35,12 @@ static void _ecore_con_client_flush(Ecore_Con_Client *cl);
static void _ecore_con_event_client_data_free(void *data, void *ev); static void _ecore_con_event_client_data_free(void *data, void *ev);
static void _ecore_con_event_server_data_free(void *data, void *ev); static void _ecore_con_event_server_data_free(void *data, void *ev);
int ECORE_CON_EVENT_CLIENT_ADD = 0; EAPI int ECORE_CON_EVENT_CLIENT_ADD = 0;
int ECORE_CON_EVENT_CLIENT_DEL = 0; EAPI int ECORE_CON_EVENT_CLIENT_DEL = 0;
int ECORE_CON_EVENT_SERVER_ADD = 0; EAPI int ECORE_CON_EVENT_SERVER_ADD = 0;
int ECORE_CON_EVENT_SERVER_DEL = 0; EAPI int ECORE_CON_EVENT_SERVER_DEL = 0;
int ECORE_CON_EVENT_CLIENT_DATA = 0; EAPI int ECORE_CON_EVENT_CLIENT_DATA = 0;
int ECORE_CON_EVENT_SERVER_DATA = 0; EAPI int ECORE_CON_EVENT_SERVER_DATA = 0;
static Ecore_List *servers = NULL; static Ecore_List *servers = NULL;
static int init_count = 0; static int init_count = 0;
@ -61,7 +61,7 @@ static int ssl_init_count = 0;
* shut down. * shut down.
* @ingroup Ecore_Con_Lib_Group * @ingroup Ecore_Con_Lib_Group
*/ */
int EAPI int
ecore_con_init(void) ecore_con_init(void)
{ {
if (++init_count != 1) return init_count; if (++init_count != 1) return init_count;
@ -87,7 +87,7 @@ ecore_con_init(void)
* shut down. * shut down.
* @ingroup Ecore_Con_Lib_Group * @ingroup Ecore_Con_Lib_Group
*/ */
int EAPI int
ecore_con_shutdown(void) ecore_con_shutdown(void)
{ {
if (--init_count != 0) return init_count; if (--init_count != 0) return init_count;
@ -134,7 +134,7 @@ ecore_con_shutdown(void)
* @return A new Ecore_Con_Server. * @return A new Ecore_Con_Server.
* @ingroup Ecore_Con_Server_Group * @ingroup Ecore_Con_Server_Group
*/ */
Ecore_Con_Server * EAPI Ecore_Con_Server *
ecore_con_server_add(Ecore_Con_Type compl_type, ecore_con_server_add(Ecore_Con_Type compl_type,
const char *name, const char *name,
int port, int port,
@ -363,7 +363,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
* @return A new Ecore_Con_Server. * @return A new Ecore_Con_Server.
* @ingroup Ecore_Con_Server_Group * @ingroup Ecore_Con_Server_Group
*/ */
Ecore_Con_Server * EAPI Ecore_Con_Server *
ecore_con_server_connect(Ecore_Con_Type compl_type, ecore_con_server_connect(Ecore_Con_Type compl_type,
const char *name, const char *name,
int port, int port,
@ -472,7 +472,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
* @return Data associated with the server when it was created. * @return Data associated with the server when it was created.
* @ingroup Ecore_Con_Server_Group * @ingroup Ecore_Con_Server_Group
*/ */
void * EAPI void *
ecore_con_server_del(Ecore_Con_Server *svr) ecore_con_server_del(Ecore_Con_Server *svr)
{ {
void *data; void *data;
@ -495,7 +495,7 @@ ecore_con_server_del(Ecore_Con_Server *svr)
* @return The associated data. * @return The associated data.
* @ingroup Ecore_Con_Server_Group * @ingroup Ecore_Con_Server_Group
*/ */
void * EAPI void *
ecore_con_server_data_get(Ecore_Con_Server *svr) ecore_con_server_data_get(Ecore_Con_Server *svr)
{ {
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@ -514,7 +514,7 @@ ecore_con_server_data_get(Ecore_Con_Server *svr)
* @return @c 1 if the server is connected. @c 0 otherwise. * @return @c 1 if the server is connected. @c 0 otherwise.
* @ingroup Ecore_Con_Server_Group * @ingroup Ecore_Con_Server_Group
*/ */
int EAPI int
ecore_con_server_connected_get(Ecore_Con_Server *svr) ecore_con_server_connected_get(Ecore_Con_Server *svr)
{ {
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@ -536,7 +536,7 @@ ecore_con_server_connected_get(Ecore_Con_Server *svr)
* error. * error.
* @ingroup Ecore_Con_Server_Group * @ingroup Ecore_Con_Server_Group
*/ */
int EAPI int
ecore_con_server_send(Ecore_Con_Server *svr, void *data, int size) ecore_con_server_send(Ecore_Con_Server *svr, void *data, int size)
{ {
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@ -592,7 +592,7 @@ ecore_con_server_send(Ecore_Con_Server *svr, void *data, int size)
* lower). * lower).
* @ingroup Ecore_Con_Server_Group * @ingroup Ecore_Con_Server_Group
*/ */
void EAPI void
ecore_con_server_client_limit_set(Ecore_Con_Server *svr, int client_limit, char reject_excess_clients) ecore_con_server_client_limit_set(Ecore_Con_Server *svr, int client_limit, char reject_excess_clients)
{ {
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@ -620,7 +620,7 @@ ecore_con_server_client_limit_set(Ecore_Con_Server *svr, int client_limit, char
* error. * error.
* @ingroup Ecore_Con_Client_Group * @ingroup Ecore_Con_Client_Group
*/ */
int EAPI int
ecore_con_client_send(Ecore_Con_Client *cl, void *data, int size) ecore_con_client_send(Ecore_Con_Client *cl, void *data, int size)
{ {
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@ -661,7 +661,7 @@ ecore_con_client_send(Ecore_Con_Client *cl, void *data, int size)
* @return The server that the client connected to. * @return The server that the client connected to.
* @ingroup Ecore_Con_Client_Group * @ingroup Ecore_Con_Client_Group
*/ */
Ecore_Con_Server * EAPI Ecore_Con_Server *
ecore_con_client_server_get(Ecore_Con_Client *cl) ecore_con_client_server_get(Ecore_Con_Client *cl)
{ {
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@ -679,7 +679,7 @@ ecore_con_client_server_get(Ecore_Con_Client *cl)
* @return Data associated with the client. * @return Data associated with the client.
* @ingroup Ecore_Con_Client_Group * @ingroup Ecore_Con_Client_Group
*/ */
void * EAPI void *
ecore_con_client_del(Ecore_Con_Client *cl) ecore_con_client_del(Ecore_Con_Client *cl)
{ {
void *data; void *data;
@ -703,7 +703,7 @@ ecore_con_client_del(Ecore_Con_Client *cl)
* @param data What to set the data to. * @param data What to set the data to.
* @ingroup Ecore_Con_Client_Group * @ingroup Ecore_Con_Client_Group
*/ */
void EAPI void
ecore_con_client_data_set(Ecore_Con_Client *cl, const void *data) ecore_con_client_data_set(Ecore_Con_Client *cl, const void *data)
{ {
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@ -721,7 +721,7 @@ ecore_con_client_data_set(Ecore_Con_Client *cl, const void *data)
* @return The data associated with @p cl. * @return The data associated with @p cl.
* @ingroup Ecore_Con_Client_Group * @ingroup Ecore_Con_Client_Group
*/ */
void * EAPI void *
ecore_con_client_data_get(Ecore_Con_Client *cl) ecore_con_client_data_get(Ecore_Con_Client *cl)
{ {
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@ -738,7 +738,7 @@ ecore_con_client_data_get(Ecore_Con_Client *cl)
* @return 1 if SSL is available, 0 if it is not. * @return 1 if SSL is available, 0 if it is not.
* @ingroup Ecore_Con_Client_Group * @ingroup Ecore_Con_Client_Group
*/ */
int EAPI int
ecore_con_ssl_available_get(void) ecore_con_ssl_available_get(void)
{ {
#if USE_OPENSSL #if USE_OPENSSL

View File

@ -57,7 +57,7 @@ static fd_set _current_fd_set;
static int init_count = 0; static int init_count = 0;
#endif #endif
int EAPI int
ecore_con_url_init(void) ecore_con_url_init(void)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
@ -98,7 +98,7 @@ ecore_con_url_init(void)
#endif #endif
} }
int EAPI int
ecore_con_url_shutdown(void) ecore_con_url_shutdown(void)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
@ -132,7 +132,7 @@ ecore_con_url_shutdown(void)
return 1; return 1;
} }
Ecore_Con_Url * EAPI Ecore_Con_Url *
ecore_con_url_new(const char *url) ecore_con_url_new(const char *url)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
@ -167,7 +167,7 @@ ecore_con_url_new(const char *url)
#endif #endif
} }
void EAPI void
ecore_con_url_destroy(Ecore_Con_Url *url_con) ecore_con_url_destroy(Ecore_Con_Url *url_con)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
@ -187,7 +187,7 @@ ecore_con_url_destroy(Ecore_Con_Url *url_con)
#endif #endif
} }
int EAPI int
ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url) ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
@ -203,7 +203,7 @@ ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url)
return 1; return 1;
} }
int EAPI int
ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *content_type) ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *content_type)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
@ -242,7 +242,7 @@ ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *cont
} }
#ifdef HAVE_CURL #ifdef HAVE_CURL
size_t static size_t
_ecore_con_url_data_cb(void *buffer, size_t size, size_t nmemb, void *userp) _ecore_con_url_data_cb(void *buffer, size_t size, size_t nmemb, void *userp)
{ {
Ecore_Con_Url *url_con; Ecore_Con_Url *url_con;