bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kwo's ecore cleanup patch 

SVN revision: 13559
This commit is contained in:
Carsten Haitzler 2005-03-02 07:06:44 +00:00
parent 476e750039
commit de28192bda
37 changed files with 317 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/ecore/configure.in
View File

@ -16,6 +16,7 @@ AC_C_CONST
AC_CHECK_SIZEOF(int, 4)
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
AC_C___ATTRIBUTE__
if test "x${bindir}" = 'x${exec_prefix}/bin'; then
if test "x${exec_prefix}" = "xNONE"; then

6
legacy/ecore/src/lib/ecore/Ecore_Data.h
View File

@ -219,6 +219,7 @@ extern "C" {
/* Removing items from the list */
void *ecore_dlist_remove(Ecore_DList * _e_dlist);
void *ecore_dlist_remove_first(Ecore_DList * _e_dlist);
int ecore_dlist_remove_destroy(Ecore_DList *list);
void *ecore_dlist_remove_last(Ecore_DList * _e_dlist);
/* Traversing the list */
@ -240,6 +241,7 @@ extern "C" {
int ecore_dlist_clear(Ecore_DList * _e_dlist);
/* Creating and initializing list nodes */
int ecore_dlist_node_init(Ecore_DList_Node * node);
Ecore_DList_Node *ecore_dlist_node_new(void);
/* Destroying nodes */
@ -307,7 +309,7 @@ extern "C" {
void ecore_hash_dump_graph(Ecore_Hash *hash);
inline void ecore_print_warning(const char *function, char *sparam);
inline void ecore_print_warning(const char *function, const char *sparam);
/* Wrappers around free() that helps debug free() bugs such as freeing NULL
* or accessing a pointer that has already been freed */
@ -457,6 +459,8 @@ extern "C" {
void *ecore_sheap_extract(Ecore_Sheap *heap);
void *ecore_sheap_extreme(Ecore_Sheap *heap);
int ecore_sheap_change(Ecore_Sheap *heap, void *item, void *newval);
int ecore_sheap_set_compare(Ecore_Sheap *heap, Ecore_Compare_Cb compare);
void ecore_sheap_set_order(Ecore_Sheap *heap, char order);
void ecore_sheap_destroy(Ecore_Sheap *heap);
void ecore_sheap_sort(Ecore_Sheap *heap);

2
legacy/ecore/src/lib/ecore/ecore_anim.c
View File

@ -122,7 +122,7 @@ _ecore_animator_shutdown(void)
}
static int
_ecore_animator(void *data)
_ecore_animator(void *data __UNUSED__)
{
Ecore_Oldlist *l;

4
legacy/ecore/src/lib/ecore/ecore_events.c
View File

@ -79,7 +79,7 @@ ecore_event_handler_del(Ecore_Event_Handler *event_handler)
return event_handler->data;
}
static void _ecore_event_generic_free (void *data, void *event)
static void _ecore_event_generic_free (void *data __UNUSED__, void *event)
{
free (event);
}
@ -433,7 +433,7 @@ _ecore_event_exe_exit_new(void)
}
void
_ecore_event_exe_exit_free(void *data, void *ev)
_ecore_event_exe_exit_free(void *data __UNUSED__, void *ev)
{
Ecore_Event_Exe_Exit *e;

10
legacy/ecore/src/lib/ecore/ecore_hash.c
View File

@ -169,7 +169,7 @@ int ecore_hash_set(Ecore_Hash *hash, void *key, void *value)
*/
void ecore_hash_destroy(Ecore_Hash *hash)
{
int i = 0;
unsigned int i = 0;
CHECK_PARAM_POINTER("hash", hash);
@ -209,7 +209,7 @@ void ecore_hash_destroy(Ecore_Hash *hash)
int ecore_hash_for_each_node(Ecore_Hash *hash, Ecore_For_Each for_each_func,
void *user_data)
{
int i = 0;
unsigned int i = 0;
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
CHECK_PARAM_POINTER_RETURN("for_each_func", for_each_func, FALSE);
@ -241,7 +241,7 @@ int ecore_hash_for_each_node(Ecore_Hash *hash, Ecore_For_Each for_each_func,
*/
Ecore_List *ecore_hash_keys(Ecore_Hash *hash)
{
int i = 0;
unsigned int i = 0;
Ecore_List *keys;
CHECK_PARAM_POINTER_RETURN("hash", hash, NULL);
@ -274,7 +274,7 @@ Ecore_List *ecore_hash_keys(Ecore_Hash *hash)
void
ecore_hash_dump_graph(Ecore_Hash *hash)
{
int i;
unsigned int i;
for (i = 0; i < ecore_prime_table[hash->size]; i++)
if (hash->buckets[i])
@ -620,7 +620,7 @@ _ecore_hash_decrease(Ecore_Hash *hash)
inline int
_ecore_hash_rehash(Ecore_Hash *hash, Ecore_List **old_table, int old_size)
{
int i;
unsigned int i;
Ecore_Hash_Node *node;
Ecore_List *old;

2
legacy/ecore/src/lib/ecore/ecore_main.c
View File

@ -421,7 +421,7 @@ static void
_ecore_main_loop_iterate_internal(int once_only)
{
double next_time;
int have_event;
int have_event = 0;
int have_signal;
in_main_loop++;

8
legacy/ecore/src/lib/ecore/ecore_private.h
View File

@ -18,6 +18,12 @@
#include <config.h>
#endif
#if HAVE___ATTRIBUTE__
#define __UNUSED__ __attribute__((unused))
#else
#define __UNUSED__
#endif
#define ECORE_MAGIC_NONE 0x1234fedc
#define ECORE_MAGIC_EXE 0xf7e812f5
#define ECORE_MAGIC_TIMER 0xf7d713f4
@ -36,7 +42,7 @@
#define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m)))
#define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic : 0, (m), (fn));
typedef int Ecore_Magic;
typedef unsigned int Ecore_Magic;
typedef struct _Ecore_Oldlist Ecore_Oldlist;

34
legacy/ecore/src/lib/ecore/ecore_signal.c
View File

@ -42,13 +42,13 @@ static volatile sig_atomic_t sigquit_count = 0;
static volatile sig_atomic_t sigint_count = 0;
static volatile sig_atomic_t sigterm_count = 0;
static volatile siginfo_t sigchld_info = {0};
static volatile siginfo_t sigusr1_info = {0};
static volatile siginfo_t sigusr2_info = {0};
static volatile siginfo_t sighup_info = {0};
static volatile siginfo_t sigquit_info = {0};
static volatile siginfo_t sigint_info = {0};
static volatile siginfo_t sigterm_info = {0};
static volatile siginfo_t sigchld_info;
static volatile siginfo_t sigusr1_info;
static volatile siginfo_t sigusr2_info;
static volatile siginfo_t sighup_info;
static volatile siginfo_t sigquit_info;
static volatile siginfo_t sigint_info;
static volatile siginfo_t sigterm_info;
#ifdef SIGPWR
static volatile sig_atomic_t sigpwr_count = 0;
@ -337,12 +337,12 @@ _ecore_signal_callback_set(int sig, Signal_Handler func)
}
static void
_ecore_signal_callback_ignore(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_ignore(int sig __UNUSED__, siginfo_t *si __UNUSED__, void *foo __UNUSED__)
{
}
static void
_ecore_signal_callback_sigchld(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigchld(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigchld_info = *si;
@ -354,7 +354,7 @@ _ecore_signal_callback_sigchld(int sig, siginfo_t *si, void *foo)
}
static void
_ecore_signal_callback_sigusr1(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigusr1(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigusr1_info = *si;
@ -366,7 +366,7 @@ _ecore_signal_callback_sigusr1(int sig, siginfo_t *si, void *foo)
}
static void
_ecore_signal_callback_sigusr2(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigusr2(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigusr2_info = *si;
@ -378,7 +378,7 @@ _ecore_signal_callback_sigusr2(int sig, siginfo_t *si, void *foo)
}
static void
_ecore_signal_callback_sighup(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sighup(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sighup_info = *si;
@ -390,7 +390,7 @@ _ecore_signal_callback_sighup(int sig, siginfo_t *si, void *foo)
}
static void
_ecore_signal_callback_sigquit(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigquit(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigquit_info = *si;
@ -402,7 +402,7 @@ _ecore_signal_callback_sigquit(int sig, siginfo_t *si, void *foo)
}
static void
_ecore_signal_callback_sigint(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigint(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigint_info = *si;
@ -414,7 +414,7 @@ _ecore_signal_callback_sigint(int sig, siginfo_t *si, void *foo)
}
static void
_ecore_signal_callback_sigterm(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigterm(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigterm_info = *si;
@ -427,7 +427,7 @@ _ecore_signal_callback_sigterm(int sig, siginfo_t *si, void *foo)
#ifdef SIGPWR
static void
_ecore_signal_callback_sigpwr(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigpwr(int sig __UNUSED__, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigpwr_info = *si;
@ -441,7 +441,7 @@ _ecore_signal_callback_sigpwr(int sig, siginfo_t *si, void *foo)
#ifdef SIGRTMIN
static void
_ecore_signal_callback_sigrt(int sig, siginfo_t *si, void *foo)
_ecore_signal_callback_sigrt(int sig, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigrt_info[sig - SIGRTMIN] = *si;

2
legacy/ecore/src/lib/ecore/ecore_value.c
View File

@ -31,7 +31,7 @@ const unsigned int ecore_prime_table[] = { 17, 31, 61, 127, 257, 509, 1021,
2097143, 4194301, 8388617, 16777213
};
inline void ecore_print_warning(const char *function, char *sparam)
inline void ecore_print_warning(const char *function, const char *sparam)
{
fprintf(stderr, "***** Developer Warning ***** :\n"
"\tThis program is calling:\n\n"

10
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -164,7 +164,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
if ((type == ECORE_CON_LOCAL_USER) ||
(type == ECORE_CON_LOCAL_SYSTEM))
{
char *homedir;
const char *homedir;
struct stat st;
mode_t pmode, mask;
@ -384,7 +384,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
if ((type == ECORE_CON_LOCAL_USER) ||
(type == ECORE_CON_LOCAL_SYSTEM))
{
char *homedir;
const char *homedir;
if (type == ECORE_CON_LOCAL_USER)
{
@ -778,7 +778,7 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
}
static int
_ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler)
_ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Ecore_Con_Server *svr;
int new_fd;
@ -1193,7 +1193,7 @@ _ecore_con_client_flush(Ecore_Con_Client *cl)
}
static void
_ecore_con_event_client_data_free(void *data, void *ev)
_ecore_con_event_client_data_free(void *data __UNUSED__, void *ev)
{
Ecore_Con_Event_Client_Data *e;
@ -1203,7 +1203,7 @@ _ecore_con_event_client_data_free(void *data, void *ev)
}
static void
_ecore_con_event_server_data_free(void *data, void *ev)
_ecore_con_event_server_data_free(void *data __UNUSED__, void *ev)
{
Ecore_Con_Event_Server_Data *e;

14
legacy/ecore/src/lib/ecore_config/Ecore_Config.h
View File

@ -150,17 +150,19 @@ extern "C"
EAPI float ecore_config_float_get(const char *key);
EAPI char *ecore_config_theme_get(const char *key);
EAPI char *ecore_config_as_string_get(const char *key);
EAPI int ecore_config_bound(Ecore_Config_Prop * e);
EAPI int ecore_config_describe(const char *key, char *desc);
EAPI int ecore_config_short_opt_set(const char *key,
char short_opt);
EAPI int ecore_config_long_opt_set(const char *key,
char *long_opt);
EAPI int ecore_config_set(const char *key, char *val);
EAPI int ecore_config_typed_set(const char *key, void *val,
EAPI int ecore_config_typed_set(const char *key, const void *val,
int type);
EAPI int ecore_config_boolean_set(const char *key, int val);
EAPI int ecore_config_string_set(const char *key, char *val);
EAPI int ecore_config_int_set(const char *key, int val);
EAPI char *ecore_config_rgb_to_argb(char *rgb);
EAPI int ecore_config_rgb_set(const char *key, char *val);
EAPI int ecore_config_argb_set(const char *key, char *val);
EAPI int ecore_config_float_set(const char *key, float val);
@ -177,7 +179,7 @@ extern "C"
EAPI int ecore_config_int_default(const char *key, int val);
EAPI int ecore_config_int_default_bound(const char *key, int val,
int lo, int hi, int step);
EAPI int ecore_config_string_default(const char *key, char *val);
EAPI int ecore_config_string_default(const char *key, const char *val);
EAPI int ecore_config_float_default(const char *key, float val);
EAPI int ecore_config_float_default_bound(const char *key,
float val, float lo,
@ -192,7 +194,7 @@ extern "C"
EAPI int ecore_config_deaf(const char *name, const char *key,
Ecore_Config_Listener listener);
EAPI Ecore_Config_Prop *ecore_config_dst(Ecore_Config_Prop * e);
EAPI int ecore_config_type_guess(const char *key, char *val);
EAPI int ecore_config_type_guess(const char *key, const char *val);
EAPI Ecore_Config_Bundle *ecore_config_bundle_new(Ecore_Config_Server * srv,
const char *id);
@ -206,16 +208,16 @@ extern "C"
EAPI long ecore_config_bundle_serial_get(Ecore_Config_Bundle * ns);
EAPI char *ecore_config_bundle_label_get(Ecore_Config_Bundle * ns);
EAPI int ecore_config_init(char *name);
EAPI int ecore_config_init(const char *name);
EAPI int ecore_config_shutdown(void);
EAPI int ecore_config_system_init(void);
EAPI int ecore_config_system_shutdown(void);
EAPI int ecore_config_load(void);
EAPI int ecore_config_file_load(char *file);
EAPI int ecore_config_file_load(const char *file);
EAPI int ecore_config_save(void);
EAPI int ecore_config_file_save(char *file);
EAPI int ecore_config_file_save(const char *file);
/* error codes */
# define ECORE_CONFIG_ERR_NOTSUPP (-16)

31
legacy/ecore/src/lib/ecore_config/ecore_config.c
View File

@ -1,6 +1,7 @@
#include "Ecore_Config.h"
#include "config.h"
#include "ecore_config_private.h"
#include "ecore_config_ipc.h"
#include <string.h>
#include <ctype.h>
@ -22,12 +23,10 @@ Ecore_Config_Bundle *__ecore_config_bundle_local = NULL;
char *__ecore_config_app_name = NULL;
int __ecore_config_system_init = 0;
Ecore_Config_Server *_ecore_config_ipc_init(char *name);
int _ecore_config_ipc_exit(void);
static int _ecore_config_system_init_no_load(void);
static int _ecore_config_system_load(void);
static char *_ecore_config_type[] =
static const char *_ecore_config_type[] =
{ "undefined", "integer", "float", "string", "colour", "theme", "boolean" };
/**
@ -439,7 +438,7 @@ ecore_config_bound(Ecore_Config_Prop * e)
* val is @c NULL, @c PT_NIL will be returned.
*/
int
ecore_config_type_guess(const char *key, char *val)
ecore_config_type_guess(const char *key, const char *val)
{
Ecore_Config_Prop *p;
char *l;
@ -467,7 +466,7 @@ ecore_config_type_guess(const char *key, char *val)
}
static int
ecore_config_typed_val(Ecore_Config_Prop * e, void *val, int type)
ecore_config_typed_val(Ecore_Config_Prop * e, const void *val, int type)
{
char *l;
long v;
@ -548,7 +547,7 @@ ecore_config_typed_val(Ecore_Config_Prop * e, void *val, int type)
}
static int
ecore_config_typed_add(const char *key, void *val, int type)
ecore_config_typed_add(const char *key, const void *val, int type)
{
Ecore_Config_Prop *e;
Ecore_Config_Bundle *t;
@ -582,7 +581,7 @@ ecore_config_typed_add(const char *key, void *val, int type)
}
static int
ecore_config_add(const char *key, char *val)
ecore_config_add(const char *key, const char *val)
{
int type;
@ -661,7 +660,7 @@ ecore_config_long_opt_set(const char *key, char *long_opt)
* @ingroup Ecore_Config_Property_Group
*/
int
ecore_config_typed_set(const char *key, void *val, int type)
ecore_config_typed_set(const char *key, const void *val, int type)
{
Ecore_Config_Prop *e;
Ecore_Config_Listener_List *l;
@ -1030,7 +1029,7 @@ ecore_config_int_default_bound(const char *key, int val, int low, int high,
* @ingroup Ecore_Config_Default_Group
*/
int
ecore_config_string_default(const char *key, char *val)
ecore_config_string_default(const char *key, const char *val)
{
return ecore_config_typed_default(key, (void *)val, PT_STR);
}
@ -1382,14 +1381,14 @@ ecore_config_bundle_new(Ecore_Config_Server * srv, const char *identifier)
return t;
}
Ecore_Config_Server *
do_init(char *name)
static Ecore_Config_Server *
do_init(const char *name)
{
return _ecore_config_ipc_init(name);
}
Ecore_Config_Server *
ecore_config_init_local(char *name)
static Ecore_Config_Server *
ecore_config_init_local(const char *name)
{
char *p;
char *buf;
@ -1407,8 +1406,8 @@ ecore_config_init_local(char *name)
return do_init(name);
}
Ecore_Config_Server *
ecore_config_init_global(char *name)
static Ecore_Config_Server *
ecore_config_init_global(const char *name)
{
char *p;
int global;
@ -1452,7 +1451,7 @@ ecore_config_init_global(char *name)
* @ingroup Ecore_Config_App_Lib_Group
*/
int
ecore_config_init(char *name)
ecore_config_init(const char *name)
{
char *path;
Ecore_Config_Prop *list;

46
legacy/ecore/src/lib/ecore_config/ecore_config_db.c
View File

@ -19,7 +19,7 @@ struct _Ecore_Config_DB_File
};
Ecore_Config_DB_File *
_ecore_config_db_open_read(char *file)
_ecore_config_db_open_read(const char *file)
{
Eet_File *ef;
Ecore_Config_DB_File *db;
@ -27,7 +27,7 @@ _ecore_config_db_open_read(char *file)
eet_init();
db = malloc(sizeof(Ecore_Config_DB_File));
if (!db) return NULL;
ef = eet_open(file, EET_FILE_MODE_READ);
ef = eet_open((char*)file, EET_FILE_MODE_READ);
if (!ef)
{
free(db);
@ -38,7 +38,7 @@ _ecore_config_db_open_read(char *file)
}
Ecore_Config_DB_File *
_ecore_config_db_open_write(char *file)
_ecore_config_db_open_write(const char *file)
{
Eet_File *ef;
Ecore_Config_DB_File *db;
@ -46,7 +46,7 @@ _ecore_config_db_open_write(char *file)
eet_init();
db = malloc(sizeof(Ecore_Config_DB_File));
if (!db) return NULL;
ef = eet_open(file, EET_FILE_MODE_WRITE);
ef = eet_open((char*)file, EET_FILE_MODE_WRITE);
if (!ef)
{
free(db);
@ -71,7 +71,7 @@ _ecore_config_db_keys_get(Ecore_Config_DB_File *db, int *num_ret)
int key_count;
int i;
keys = eet_list(db->ef, "*", &key_count);
keys = eet_list(db->ef, (char*)"*", &key_count);
if (!keys)
{
*num_ret = 0;
@ -84,12 +84,12 @@ _ecore_config_db_keys_get(Ecore_Config_DB_File *db, int *num_ret)
}
char *
_ecore_config_db_key_type_get(Ecore_Config_DB_File *db, char *key)
_ecore_config_db_key_type_get(Ecore_Config_DB_File *db, const char *key)
{
char *data;
int size;
data = eet_read(db->ef, key, &size);
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
if (size <= 2)
@ -108,12 +108,12 @@ _ecore_config_db_key_type_get(Ecore_Config_DB_File *db, char *key)
}
int
_ecore_config_db_key_int_get(Ecore_Config_DB_File *db, char *key, int *dest)
_ecore_config_db_key_int_get(Ecore_Config_DB_File *db, const char *key, int *dest)
{
char *data;
int size;
data = eet_read(db->ef, key, &size);
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
int l;
@ -147,12 +147,12 @@ _ecore_config_db_key_int_get(Ecore_Config_DB_File *db, char *key, int *dest)
}
int
_ecore_config_db_key_float_get(Ecore_Config_DB_File *db, char *key, double *dest)
_ecore_config_db_key_float_get(Ecore_Config_DB_File *db, const char *key, double *dest)
{
char *data;
int size;
data = eet_read(db->ef, key, &size);
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
int l;
@ -186,12 +186,12 @@ _ecore_config_db_key_float_get(Ecore_Config_DB_File *db, char *key, double *dest
}
char *
_ecore_config_db_key_str_get(Ecore_Config_DB_File *db, char *key)
_ecore_config_db_key_str_get(Ecore_Config_DB_File *db, const char *key)
{
char *data;
int size;
data = eet_read(db->ef, key, &size);
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
int l;
@ -222,12 +222,12 @@ _ecore_config_db_key_str_get(Ecore_Config_DB_File *db, char *key)
}
void *
_ecore_config_db_key_data_get(Ecore_Config_DB_File *db, char *key, int *size_ret)
_ecore_config_db_key_data_get(Ecore_Config_DB_File *db, const char *key, int *size_ret)
{
char *data;
int size;
data = eet_read(db->ef, key, &size);
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
int l;
@ -260,7 +260,7 @@ _ecore_config_db_key_data_get(Ecore_Config_DB_File *db, char *key, int *size_ret
}
void
_ecore_config_db_key_int_set(Ecore_Config_DB_File *db, char *key, int val)
_ecore_config_db_key_int_set(Ecore_Config_DB_File *db, const char *key, int val)
{
char buf[256];
int num;
@ -271,11 +271,11 @@ _ecore_config_db_key_int_set(Ecore_Config_DB_File *db, char *key, int val)
if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
buf[3] = 0;
buf[num - 1] = 0;
eet_write(db->ef, key, buf, num, 1);
eet_write(db->ef, (char*)key, buf, num, 1);
}
void
_ecore_config_db_key_float_set(Ecore_Config_DB_File *db, char *key, double val)
_ecore_config_db_key_float_set(Ecore_Config_DB_File *db, const char *key, double val)
{
char buf[256];
int num;
@ -286,11 +286,11 @@ _ecore_config_db_key_float_set(Ecore_Config_DB_File *db, char *key, double val)
if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
buf[5] = 0;
buf[num - 1] = 0;
eet_write(db->ef, key, buf, num, 1);
eet_write(db->ef, (char*)key, buf, num, 1);
}
void
_ecore_config_db_key_str_set(Ecore_Config_DB_File *db, char *key, char *str)
_ecore_config_db_key_str_set(Ecore_Config_DB_File *db, const char *key, char *str)
{
char *buf;
int num;
@ -300,12 +300,12 @@ _ecore_config_db_key_str_set(Ecore_Config_DB_File *db, char *key, char *str)
if (!buf) return;
strcpy(buf, "str");
strcpy(buf + 4, str);
eet_write(db->ef, key, buf, num, 1);
eet_write(db->ef, (char*)key, buf, num, 1);
free(buf);
}
void
_ecore_config_db_key_data_set(Ecore_Config_DB_File *db, char *key, void *data, int data_size)
_ecore_config_db_key_data_set(Ecore_Config_DB_File *db, const char *key, void *data, int data_size)
{
char *buf;
int num;
@ -316,6 +316,6 @@ _ecore_config_db_key_data_set(Ecore_Config_DB_File *db, char *key, void *data, i
strcpy(buf, "data");
memcpy(buf + 5, data, data_size);
buf[num - 1] = 0;
eet_write(db->ef, key, buf, num, 1);
eet_write(db->ef, (char*)key, buf, num, 1);
free(buf);
}

11
legacy/ecore/src/lib/ecore_config/ecore_config_extra.c
View File

@ -25,9 +25,6 @@ struct __Ecore_Config_Arg_Callback
char *__ecore_config_app_description;
_Ecore_Config_Arg_Callback *_ecore_config_arg_callbacks;
extern int ecore_config_bound(Ecore_Config_Prop * e);
extern char *ecore_config_rgb_to_argb(char *rgb);
/* shorthand prop setup code to make client apps a little smaller ;) */
/**
@ -451,7 +448,7 @@ ecore_config_theme_search_path_append(char *path)
search_len = strlen(search_path);
if (loc == NULL || (loc != search_path && *(loc - 1) != '|') ||
(loc != (search_len - len) && *(loc + len - 1) != '|'))
(loc != (search_path + search_len - len) && *(loc + len - 1) != '|'))
{
new_search_path = malloc(search_len + len + 2); /* 2 = \0 + | */
strcpy(new_search_path, search_path);
@ -541,7 +538,7 @@ ecore_config_theme_with_path_get(const char *key)
ecore_config_theme_with_path_from_name_get(ecore_config_theme_get(key));
}
static char *_ecore_config_short_types[] =
static const char *_ecore_config_short_types[] =
{ " ", "<int> ", "<flt> ", "<str> ", "<rgb> ", "<str> ", "<bool>" };
/**
@ -705,8 +702,8 @@ ecore_config_args_parse(void)
ecore_config_parse_set(prop, argv[++nextarg],
long_opt,
'\0')) !=
ECORE_CONFIG_PARSE_CONTINUE);
return ret;
ECORE_CONFIG_PARSE_CONTINUE)
return ret;
break;
}
prop = prop->next;

3
legacy/ecore/src/lib/ecore_config/ecore_config_ipc.h
View File

@ -20,6 +20,9 @@ typedef enum
IPC_LAST
} Ecore_Config_Ipc_Call;
Ecore_Config_Server *_ecore_config_ipc_init(const char *pipe_name);
int _ecore_config_ipc_exit(void);
Ecore_Config_Server *_ecore_config_server_convert(void *srv);
char *_ecore_config_ipc_prop_list(Ecore_Config_Server * srv,

6
legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c
View File

@ -19,6 +19,7 @@
#include "Ecore_Config.h"
#include "config.h"
#if 0 /* FIXME - No prototypes? */
/*****************************************************************************/
static int
@ -44,7 +45,7 @@ _ecore_config_ipc_ecore_string_get(char **m, char **r)
return ECORE_CONFIG_ERR_SUCC;
}
char *
static char *
_ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv, const long serial)
{
Ecore_Config_DB_File *db;
@ -75,7 +76,7 @@ _ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv, const long serial)
for (x = 0; x < key_count; x++)
{
type = _ecore_config_db_key_type_get(db, keys[x]);
if (!type) type = "?";
if (!type) type = strdup("?");
if (!strcmp(type, "int"))
estring_appendf(s, "%s%s: integer", f ? "\n" : "", keys[x]);
else if (!strcmp(type, "float"))
@ -375,3 +376,4 @@ _ecore_config_mod_poll(void **data)
}
/*****************************************************************************/
#endif

4
legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c
View File

@ -26,7 +26,7 @@ typedef struct _ecore_config_ipc
{
void *lib;
void *data;
int (*ipc_init) (char *pipe_name, void **data);
int (*ipc_init) (const char *pipe_name, void **data);
int (*ipc_exit) (void **data);
int (*ipc_poll) (void **data);
struct _ecore_config_ipc *next;
@ -273,7 +273,7 @@ _ecore_config_ipc_exit(void)
}
Ecore_Config_Server *
_ecore_config_ipc_init(char *pipe_name)
_ecore_config_ipc_init(const char *pipe_name)
{
char buf[PATH_MAX];
glob_t globbuf;

22
legacy/ecore/src/lib/ecore_config/ecore_config_private.h
View File

@ -8,18 +8,18 @@ extern int DEBUG;
typedef struct _Ecore_Config_DB_File Ecore_Config_DB_File;
Ecore_Config_DB_File *_ecore_config_db_open_read(char *file);
Ecore_Config_DB_File *_ecore_config_db_open_write(char *file);
Ecore_Config_DB_File *_ecore_config_db_open_read(const char *file);
Ecore_Config_DB_File *_ecore_config_db_open_write(const char *file);
void _ecore_config_db_close(Ecore_Config_DB_File *db);
char **_ecore_config_db_keys_get(Ecore_Config_DB_File *db, int *num_ret);
char *_ecore_config_db_key_type_get(Ecore_Config_DB_File *db, char *key);
int _ecore_config_db_key_int_get(Ecore_Config_DB_File *db, char *key, int *dest);
int _ecore_config_db_key_float_get(Ecore_Config_DB_File *db, char *key, double *dest);
char *_ecore_config_db_key_str_get(Ecore_Config_DB_File *db, char *key);
void *_ecore_config_db_key_data_get(Ecore_Config_DB_File *db, char *key, int *size_ret);
void _ecore_config_db_key_int_set(Ecore_Config_DB_File *db, char *key, int val);
void _ecore_config_db_key_float_set(Ecore_Config_DB_File *db, char *key, double val);
void _ecore_config_db_key_str_set(Ecore_Config_DB_File *db, char *key, char *str);
void _ecore_config_db_key_data_set(Ecore_Config_DB_File *db, char *key, void *data, int data_size);
char *_ecore_config_db_key_type_get(Ecore_Config_DB_File *db, const char *key);
int _ecore_config_db_key_int_get(Ecore_Config_DB_File *db, const char *key, int *dest);
int _ecore_config_db_key_float_get(Ecore_Config_DB_File *db, const char *key, double *dest);
char *_ecore_config_db_key_str_get(Ecore_Config_DB_File *db, const char *key);
void *_ecore_config_db_key_data_get(Ecore_Config_DB_File *db, const char *key, int *size_ret);
void _ecore_config_db_key_int_set(Ecore_Config_DB_File *db, const char *key, int val);
void _ecore_config_db_key_float_set(Ecore_Config_DB_File *db, const char *key, double val);
void _ecore_config_db_key_str_set(Ecore_Config_DB_File *db, const char *key, char *str);
void _ecore_config_db_key_data_set(Ecore_Config_DB_File *db, const char *key, void *data, int data_size);
#endif

8
legacy/ecore/src/lib/ecore_config/ecore_config_storage.c
View File

@ -52,7 +52,7 @@ ecore_config_save(void)
* @ingroup Ecore_Config_File_Group
*/
int
ecore_config_file_load(char *file)
ecore_config_file_load(const char *file)
{
Ecore_Config_DB_File *db;
char **keys;
@ -80,7 +80,7 @@ ecore_config_file_load(char *file)
for (x = 0; x < key_count; x++)
{
type = _ecore_config_db_key_type_get(db, keys[x]);
if (!type) type = "?";
if (!type) type = strdup("?");
if (!strcmp(type, "int"))
{
if (_ecore_config_db_key_int_get(db, keys[x], &itmp))
@ -160,7 +160,7 @@ ecore_config_file_load(char *file)
}
static void
_ecore_config_recurse_mkdir(char *file)
_ecore_config_recurse_mkdir(const char *file)
{
char *file_ptr;
char *file_tmp;
@ -189,7 +189,7 @@ _ecore_config_recurse_mkdir(char *file)
* @ingroup Ecore_Config_File_Group
*/
int
ecore_config_file_save(char *file)
ecore_config_file_save(const char *file)
{
Ecore_Config_Prop *next;
Ecore_Config_DB_File *db;

101
legacy/ecore/src/lib/ecore_config/ecore_config_util.c
View File

@ -16,6 +16,8 @@
/* # include <glib/gmain.h> */
/* #endif */
#include "ecore_private.h"
#include "Ecore_Config.h"
#include "ecore_config_util.h"
@ -28,7 +30,7 @@
/********/
int
dlmulti(char *name, char *file, int flag, void **libr, const char *fmt, ...)
dlmulti(const char *name, const char *file, int flag, void **libr, const char *fmt, ...)
{
#define MAX_SYM_LEN 256
va_list ap;
@ -124,6 +126,7 @@ dlmulti(char *name, char *file, int flag, void **libr, const char *fmt, ...)
return ret;
}
#if 0 /* Unused */
/*****************************************************************************/
unsigned long
@ -136,6 +139,7 @@ now(long delay)
r = tv.tv_sec * 1000 + (((float)tv.tv_usec) / 1000.0) + delay;
return r;
}
#endif
/*****************************************************************************/
@ -269,25 +273,37 @@ qsrt(void *a[], void *data, int lo, int hi,
/* TIMERS */
/**********/
#ifdef HAVE_GLIB2
unsigned long
timeout_add(uint f, int (*fun) (void *), void *data)
{
#ifdef HAVE_GLIB2
return g_timeout_add((guint) f, (GSourceFunc) fun, (gpointer) data);
#endif
return 0;
}
int
timeout_remove(unsigned long handle)
{
#ifdef HAVE_GLIB2
return g_source_remove(handle) ? ECORE_CONFIG_ERR_SUCC :
ECORE_CONFIG_ERR_FAIL;
#endif
}
#else
unsigned long
timeout_add(uint f __UNUSED__, int (*fun) (void *) __UNUSED__, void *data __UNUSED__)
{
return 0;
}
int
timeout_remove(unsigned long handle __UNUSED__)
{
return ECORE_CONFIG_ERR_NOTSUPP;
}
#endif /* HAVE_GLIB2 */
/*****************************************************************************/
/* HASHES */
/**********/
@ -374,74 +390,101 @@ eslist_append(eslist ** e, void *p)
/* HASHES */
/**********/
#ifdef HAVE_GLIB2
void *
hash_table_new(void (*freekey), void (*freeval))
{
#ifdef HAVE_GLIB2
return g_hash_table_new_full(g_str_hash, g_str_equal, freekey, freeval);
#endif
return NULL;
}
void *
hash_table_fetch(void *hashtable, char *key)
{
#ifdef HAVE_GLIB2
return g_hash_table_lookup(hashtable, key);
#endif
return NULL;
}
int
hash_table_insert(void *hashtable, char *key, void *value)
{
#ifdef HAVE_GLIB2
g_hash_table_insert(hashtable, key, value);
return ECORE_CONFIG_ERR_SUCC;
#endif
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_replace(void *hashtable, char *key, void *value)
{
#ifdef HAVE_GLIB2
g_hash_table_replace(hashtable, key, value);
return ECORE_CONFIG_ERR_SUCC;
#endif
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_remove(void *hashtable, char *key)
{
#ifdef HAVE_GLIB2
g_hash_table_remove(hashtable, key);
return ECORE_CONFIG_ERR_SUCC;
#endif
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_dst(void *hashtable)
{
#ifdef HAVE_GLIB2
g_hash_table_destroy(hashtable);
return ECORE_CONFIG_ERR_SUCC;
#endif
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_walk(void *hashtable, hash_walker fun, void *data)
{
#ifdef HAVE_GLIB2
g_hash_table_foreach(hashtable, (GHFunc) fun, data);
return ECORE_CONFIG_ERR_SUCC;
#endif
}
#else
void *
hash_table_new(void (*freekey) __UNUSED__, void (*freeval) __UNUSED__)
{
return NULL;
}
void *
hash_table_fetch(void *hashtable __UNUSED__, char *key __UNUSED__)
{
return NULL;
}
int
hash_table_insert(void *hashtable __UNUSED__, char *key __UNUSED__, void *value __UNUSED__)
{
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_replace(void *hashtable __UNUSED__, char *key __UNUSED__, void *value __UNUSED__)
{
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_remove(void *hashtable __UNUSED__, char *key __UNUSED__)
{
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_dst(void *hashtable __UNUSED__)
{
return ECORE_CONFIG_ERR_NOTSUPP;
}
int
hash_table_walk(void *hashtable __UNUSED__, hash_walker fun __UNUSED__, void *data __UNUSED__)
{
return ECORE_CONFIG_ERR_NOTSUPP;
}
#endif /* HAVE_GLIB2 */
/*****************************************************************************/
/* STRINGS */
/***********/
@ -509,7 +552,7 @@ estring_truncate(estring * e, int size)
}
int
estring_printf(estring * e, char *fmt, ...)
estring_printf(estring * e, const char *fmt, ...)
{
int need;
va_list ap;
@ -550,7 +593,7 @@ estring_printf(estring * e, char *fmt, ...)
}
int
estring_appendf(estring * e, char *fmt, ...)
estring_appendf(estring * e, const char *fmt, ...)
{
int need;
va_list ap;
@ -595,7 +638,7 @@ estring_appendf(estring * e, char *fmt, ...)
}
int
esprintf(char **result, char *fmt, ...)
esprintf(char **result, const char *fmt, ...)
{
int need, have;
va_list ap;

10
legacy/ecore/src/lib/ecore_config/ecore_config_util.h
View File

@ -20,7 +20,7 @@ char *unit_size(char *size);
void qsrt(void *a[], void *data, int lo, int hi,
int (*compare) (const void *, const void *,
const void *));
int dlmulti(char *name, char *file, int flag, void **libr,
int dlmulti(const char *name, const char *file, int flag, void **libr,
const char *fmt, ...);
typedef void (*hash_walker) (char *key, void *value, void *data);
@ -48,14 +48,14 @@ estring *estring_new(int size);
estring *estring_dst(estring * e);
char *estring_disown(estring * e);
char *estring_free(estring * e, int release_payload); /* glib compat */
int estring_printf(estring * e, char *fmt, ...);
int estring_appendf(estring * e, char *fmt, ...);
int estring_printf(estring * e, const char *fmt, ...);
int estring_appendf(estring * e, const char *fmt, ...);
int estring_truncate(estring * e, int size);
#define ESTRING_GET_CSTRING(a) ((a)->str)
int esprintf(char **result, char *fmt, ...);
int ejoin(char **result, char *delim, ...);
int esprintf(char **result, const char *fmt, ...);
int ejoin(char **result, const char *delim, ...);
int ecat(char **result, ...);
unsigned long timeout_add(unsigned int f, int (*fun) (void *),

26
legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
View File

@ -159,7 +159,7 @@ _ecore_evas_buffer_coord_translate(Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y)
}
static void
_ecore_evas_buffer_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
@ -168,7 +168,7 @@ _ecore_evas_buffer_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *even
}
static void
_ecore_evas_buffer_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
@ -177,7 +177,7 @@ _ecore_evas_buffer_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *eve
}
static void
_ecore_evas_buffer_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Ecore_Evas *ee;
Evas_Event_Mouse_Down *ev;
@ -188,7 +188,7 @@ _ecore_evas_buffer_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *ev
}
static void
_ecore_evas_buffer_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Ecore_Evas *ee;
Evas_Event_Mouse_Up *ev;
@ -199,7 +199,7 @@ _ecore_evas_buffer_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *even
}
static void
_ecore_evas_buffer_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Ecore_Evas *ee;
Evas_Event_Mouse_Move *ev;
@ -214,7 +214,7 @@ _ecore_evas_buffer_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *ev
}
static void
_ecore_evas_buffer_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Ecore_Evas *ee;
Evas_Event_Mouse_Wheel *ev;
@ -225,7 +225,7 @@ _ecore_evas_buffer_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *e
}
static void
_ecore_evas_buffer_cb_free(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_free(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
@ -235,7 +235,7 @@ _ecore_evas_buffer_cb_free(void *data, Evas *e, Evas_Object *obj, void *event_in
}
static void
_ecore_evas_buffer_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_key_down(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info)
{
Ecore_Evas *ee;
Evas_Event_Key_Down *ev;
@ -282,7 +282,7 @@ _ecore_evas_buffer_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *even
}
static void
_ecore_evas_buffer_cb_key_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_key_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info)
{
Ecore_Evas *ee;
Evas_Event_Key_Up *ev;
@ -329,7 +329,7 @@ _ecore_evas_buffer_cb_key_up(void *data, Evas *e, Evas_Object *obj, void *event_
}
static void
_ecore_evas_buffer_cb_focus_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_focus_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
@ -339,7 +339,7 @@ _ecore_evas_buffer_cb_focus_in(void *data, Evas *e, Evas_Object *obj, void *even
}
static void
_ecore_evas_buffer_cb_focus_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_focus_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
@ -349,7 +349,7 @@ _ecore_evas_buffer_cb_focus_out(void *data, Evas *e, Evas_Object *obj, void *eve
}
static void
_ecore_evas_buffer_cb_show(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;
@ -359,7 +359,7 @@ _ecore_evas_buffer_cb_show(void *data, Evas *e, Evas_Object *obj, void *event_in
}
static void
_ecore_evas_buffer_cb_hide(void *data, Evas *e, Evas_Object *obj, void *event_info)
_ecore_evas_buffer_cb_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Ecore_Evas *ee;

18
legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
View File

@ -70,7 +70,7 @@ _ecore_evas_fb_match(void)
}
static void
_ecore_evas_fb_lose(void *data)
_ecore_evas_fb_lose(void *data __UNUSED__)
{
Ecore_Oldlist *l;
@ -84,7 +84,7 @@ _ecore_evas_fb_lose(void *data)
}
static void
_ecore_evas_fb_gain(void *data)
_ecore_evas_fb_gain(void *data __UNUSED__)
{
Ecore_Oldlist *l;
@ -99,7 +99,7 @@ _ecore_evas_fb_gain(void *data)
}
static int
_ecore_evas_event_key_down(void *data, int type, void *event)
_ecore_evas_event_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Fb_Event_Key_Down *e;
@ -112,7 +112,7 @@ _ecore_evas_event_key_down(void *data, int type, void *event)
}
static int
_ecore_evas_event_key_up(void *data, int type, void *event)
_ecore_evas_event_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Fb_Event_Key_Up *e;
@ -125,7 +125,7 @@ _ecore_evas_event_key_up(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_button_down(void *data, int type, void *event)
_ecore_evas_event_mouse_button_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Fb_Event_Mouse_Button_Down *e;
@ -142,7 +142,7 @@ _ecore_evas_event_mouse_button_down(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_button_up(void *data, int type, void *event)
_ecore_evas_event_mouse_button_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Fb_Event_Mouse_Button_Up *e;
@ -156,7 +156,7 @@ _ecore_evas_event_mouse_button_up(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_move(void *data, int type, void *event)
_ecore_evas_event_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Fb_Event_Mouse_Move *e;
@ -169,7 +169,7 @@ _ecore_evas_event_mouse_move(void *data, int type, void *event)
}
static int
_ecore_evas_idle_enter(void *data)
_ecore_evas_idle_enter(void *data __UNUSED__)
{
Ecore_Oldlist *l;
double t1 = 0.;
@ -251,7 +251,7 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
}
static void
_ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
_ecore_evas_move_resize(Ecore_Evas *ee, int x __UNUSED__, int y __UNUSED__, int w, int h)
{
if ((w == ee->w) && (h == ee->h)) return;
ee->w = w;

44
legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
View File

@ -111,7 +111,7 @@ _ecore_evas_modifier_locks_update(Ecore_Evas *ee, int modifiers)
}
static int
_ecore_evas_event_key_down(void *data, int type, void *event)
_ecore_evas_event_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Key_Down *e;
@ -125,7 +125,7 @@ _ecore_evas_event_key_down(void *data, int type, void *event)
}
static int
_ecore_evas_event_key_up(void *data, int type, void *event)
_ecore_evas_event_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Key_Up *e;
@ -139,7 +139,7 @@ _ecore_evas_event_key_up(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_button_down(void *data, int type, void *event)
_ecore_evas_event_mouse_button_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_Button_Down *e;
@ -157,7 +157,7 @@ _ecore_evas_event_mouse_button_down(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_button_up(void *data, int type, void *event)
_ecore_evas_event_mouse_button_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_Button_Up *e;
@ -172,7 +172,7 @@ _ecore_evas_event_mouse_button_up(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_wheel(void *data, int type, void *event)
_ecore_evas_event_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_Wheel *e;
@ -191,7 +191,7 @@ _ecore_evas_event_mouse_wheel(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_move(void *data, int type, void *event)
_ecore_evas_event_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_Move *e;
@ -205,7 +205,7 @@ _ecore_evas_event_mouse_move(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_in(void *data, int type, void *event)
_ecore_evas_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_In *e;
@ -223,7 +223,7 @@ _ecore_evas_event_mouse_in(void *data, int type, void *event)
}
static int
_ecore_evas_event_mouse_out(void *data, int type, void *event)
_ecore_evas_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_Out *e;
@ -242,7 +242,7 @@ _ecore_evas_event_mouse_out(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_focus_in(void *data, int type, void *event)
_ecore_evas_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Focus_In *e;
@ -256,7 +256,7 @@ _ecore_evas_event_window_focus_in(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_focus_out(void *data, int type, void *event)
_ecore_evas_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Focus_Out *e;
@ -272,7 +272,7 @@ _ecore_evas_event_window_focus_out(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_damage(void *data, int type, void *event)
_ecore_evas_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Damage *e;
@ -322,7 +322,7 @@ _ecore_evas_event_window_damage(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_destroy(void *data, int type, void *event)
_ecore_evas_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Destroy *e;
@ -336,7 +336,7 @@ _ecore_evas_event_window_destroy(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_configure(void *data, int type, void *event)
_ecore_evas_event_window_configure(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Configure *e;
@ -395,7 +395,7 @@ _ecore_evas_event_window_configure(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_delete_request(void *data, int type, void *event)
_ecore_evas_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Delete_Request *e;
@ -408,7 +408,7 @@ _ecore_evas_event_window_delete_request(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_show(void *data, int type, void *event)
_ecore_evas_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Show *e;
@ -423,7 +423,7 @@ _ecore_evas_event_window_show(void *data, int type, void *event)
}
static int
_ecore_evas_event_window_hide(void *data, int type, void *event)
_ecore_evas_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Window_Hide *e;
@ -438,7 +438,7 @@ _ecore_evas_event_window_hide(void *data, int type, void *event)
}
static int
_ecore_evas_idle_enter(void *data)
_ecore_evas_idle_enter(void *data __UNUSED__)
{
Ecore_Oldlist *l;
double t1 = 0.;
@ -552,12 +552,14 @@ _ecore_evas_idle_enter(void *data)
}
else
{
Evas_List *updates, *l;
Evas_List *updates;
updates = evas_render_updates(ee->evas);
if (updates)
{
#if 0
Evas_List *l;
printf("RENDER [%p] [%ix%i]\n",
ee, ee->w, ee->h);
for (l = updates; l; l = l->next)
@ -963,7 +965,7 @@ _ecore_evas_layer_set(Ecore_Evas *ee, int layer)
}
static void
_ecore_evas_focus_set(Ecore_Evas *ee, int on)
_ecore_evas_focus_set(Ecore_Evas *ee, int on __UNUSED__)
{
ecore_x_window_focus(ee->engine.x.win_container);
}
@ -1286,7 +1288,7 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
{
for (i = 0; i < num; i++)
{
if (roots[i] == at.root == roots[i])
if (at.root == roots[i])
{
screen = i;
break;
@ -1453,7 +1455,7 @@ ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
{
for (i = 0; i < num; i++)
{
if (roots[i] == at.root == roots[i])
if (at.root == roots[i])
{
screen = i;
break;

30
legacy/ecore/src/lib/ecore_fb/ecore_fb.c
View File

@ -78,9 +78,9 @@ struct _Ecore_Fb_Ps2_Event
};
static void _ecore_fb_size_get(int *w, int *h);
static int _ecore_fb_ts_fd_handler(Ecore_Fd_Handler *fd_handler, void *data);
static int _ecore_fb_kbd_fd_handler(Ecore_Fd_Handler *fd_handler, void *data);
static int _ecore_fb_ps2_fd_handler(Ecore_Fd_Handler *fd_handler, void *data);
static int _ecore_fb_ts_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
static int _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
static int _ecore_fb_ps2_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
static void _ecore_fb_event_free_key_down(void *data, void *ev);
static void _ecore_fb_event_free_key_up(void *data, void *ev);
static int _ecore_fb_signal_usr_handler(void *data, int type, void *ev);
@ -128,12 +128,12 @@ static void _ecore_fb_event_filter_end(void *data, void *loop_data);
static double _ecore_fb_double_click_time = 0.25;
static char *_ecore_fb_kbd_syms[128 * 6] =
static const char *_ecore_fb_kbd_syms[128 * 6] =
{
#include "ecore_fb_keytab.h"
};
static char *_ecore_fb_btn_syms[128] =
static const char *_ecore_fb_btn_syms[128] =
{
"0x00",
"Escape",
@ -263,7 +263,7 @@ static char *_ecore_fb_btn_syms[128] =
* @ingroup Ecore_FB_Library_Group
*/
int
ecore_fb_init(const char *name)
ecore_fb_init(const char *name __UNUSED__)
{
int prev_flags;
@ -763,7 +763,7 @@ _ecore_fb_size_get(int *w, int *h)
}
static int
_ecore_fb_ts_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
_ecore_fb_ts_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
static int prev_x = 0, prev_y = 0, prev_pressure = 0;
static double last_time = 0;
@ -854,7 +854,7 @@ _ecore_fb_ts_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
}
static int
_ecore_fb_kbd_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
_ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
int v = 0;
@ -976,7 +976,7 @@ _ecore_fb_kbd_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
}
static int
_ecore_fb_ps2_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
_ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
static int prev_x = 0, prev_y = 0, prev_button = 0;
static double last_time = 0;
@ -1083,7 +1083,7 @@ _ecore_fb_ps2_fd_handler(Ecore_Fd_Handler *fd_handler, void *data)
}
static void
_ecore_fb_event_free_key_down(void *data, void *ev)
_ecore_fb_event_free_key_down(void *data __UNUSED__, void *ev)
{
Ecore_Fb_Event_Key_Up *e;
@ -1095,7 +1095,7 @@ _ecore_fb_event_free_key_down(void *data, void *ev)
}
static void
_ecore_fb_event_free_key_up(void *data, void *ev)
_ecore_fb_event_free_key_up(void *data __UNUSED__, void *ev)
{
Ecore_Fb_Event_Key_Up *e;
@ -1107,7 +1107,7 @@ _ecore_fb_event_free_key_up(void *data, void *ev)
}
static int
_ecore_fb_signal_usr_handler(void *data, int type, void *ev)
_ecore_fb_signal_usr_handler(void *data __UNUSED__, int type __UNUSED__, void *ev)
{
Ecore_Event_Signal_User *e;
@ -1215,7 +1215,7 @@ struct _Ecore_Fb_Filter_Data
};
static void *
_ecore_fb_event_filter_start(void *data)
_ecore_fb_event_filter_start(void *data __UNUSED__)
{
Ecore_Fb_Filter_Data *filter_data;
@ -1224,7 +1224,7 @@ _ecore_fb_event_filter_start(void *data)
}
static int
_ecore_fb_event_filter_filter(void *data, void *loop_data,int type, void *event)
_ecore_fb_event_filter_filter(void *data __UNUSED__, void *loop_data,int type, void *event __UNUSED__)
{
Ecore_Fb_Filter_Data *filter_data;
@ -1243,7 +1243,7 @@ _ecore_fb_event_filter_filter(void *data, void *loop_data,int type, void *event)
}
static void
_ecore_fb_event_filter_end(void *data, void *loop_data)
_ecore_fb_event_filter_end(void *data __UNUSED__, void *loop_data)
{
Ecore_Fb_Filter_Data *filter_data;

3
legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c
View File

@ -1,6 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "ecore_private.h"
#include "ecore_file_private.h"
#ifdef HAVE_POLL
@ -178,7 +179,7 @@ ecore_file_monitor_del(Ecore_File_Monitor *em)
}
static int
_ecore_file_monitor_handler(void *data)
_ecore_file_monitor_handler(void *data __UNUSED__)
{
Evas_List *monitor;

22
legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
View File

@ -42,7 +42,7 @@ _ecore_ipc_dlt_int(int out, int prev, int *mode)
*mode = DLT_ZERO;
return 0;
}
if (out == 0xffffffff)
if (out == (int)0xffffffff)
{
*mode = DLT_ONE;
return 0;
@ -711,7 +711,7 @@ ecore_ipc_ssl_available_get(void)
static int
_ecore_ipc_event_client_add(void *data, int ev_type, void *ev)
_ecore_ipc_event_client_add(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Client_Add *e;
@ -744,7 +744,7 @@ _ecore_ipc_event_client_add(void *data, int ev_type, void *ev)
}
static int
_ecore_ipc_event_client_del(void *data, int ev_type, void *ev)
_ecore_ipc_event_client_del(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Client_Del *e;
@ -770,7 +770,7 @@ _ecore_ipc_event_client_del(void *data, int ev_type, void *ev)
}
static int
_ecore_ipc_event_server_add(void *data, int ev_type, void *ev)
_ecore_ipc_event_server_add(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Server_Add *e;
@ -796,7 +796,7 @@ _ecore_ipc_event_server_add(void *data, int ev_type, void *ev)
}
static int
_ecore_ipc_event_server_del(void *data, int ev_type, void *ev)
_ecore_ipc_event_server_del(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Server_Del *e;
@ -863,7 +863,7 @@ _ecore_ipc_event_server_del(void *data, int ev_type, void *ev)
msg._member = _ecore_ipc_ddlt_int(d, cl->prev.i._member, md);
static int
_ecore_ipc_event_client_data(void *data, int ev_type, void *ev)
_ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Client_Data *e;
@ -902,7 +902,7 @@ _ecore_ipc_event_client_data(void *data, int ev_type, void *ev)
}
/* examine header */
redo:
if ((cl->buf_size - offset) >= sizeof(int))
if ((cl->buf_size - offset) >= (int)sizeof(int))
{
int s, md, d, head;
unsigned char *dd;
@ -1036,7 +1036,7 @@ _ecore_ipc_event_client_data(void *data, int ev_type, void *ev)
msg._member = _ecore_ipc_ddlt_int(d, svr->prev.i._member, md);
static int
_ecore_ipc_event_server_data(void *data, int ev_type, void *ev)
_ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Con_Event_Server_Data *e;
@ -1075,7 +1075,7 @@ _ecore_ipc_event_server_data(void *data, int ev_type, void *ev)
}
/* examine header */
redo:
if ((svr->buf_size - offset) >= sizeof(int))
if ((svr->buf_size - offset) >= (int)sizeof(int))
{
int s, md, d, head;
unsigned char *dd;
@ -1168,7 +1168,7 @@ _ecore_ipc_event_server_data(void *data, int ev_type, void *ev)
}
static void
_ecore_ipc_event_client_data_free(void *data, void *ev)
_ecore_ipc_event_client_data_free(void *data __UNUSED__, void *ev)
{
Ecore_Ipc_Event_Client_Data *e;
@ -1178,7 +1178,7 @@ _ecore_ipc_event_client_data_free(void *data, void *ev)
}
static void
_ecore_ipc_event_server_data_free(void *data, void *ev)
_ecore_ipc_event_server_data_free(void *data __UNUSED__, void *ev)
{
Ecore_Ipc_Event_Server_Data *e;

4
legacy/ecore/src/lib/ecore_job/ecore_job.c
View File

@ -67,7 +67,7 @@ ecore_job_del(Ecore_Job *job)
}
static int
_ecore_job_event_handler(void *data, int type, void *ev)
_ecore_job_event_handler(void *data __UNUSED__, int type __UNUSED__, void *ev)
{
Ecore_Job *job;
@ -77,7 +77,7 @@ _ecore_job_event_handler(void *data, int type, void *ev)
}
static void
_ecore_job_event_free(void *data, void *ev)
_ecore_job_event_free(void *data __UNUSED__, void *ev)
{
Ecore_Job *job;

4
legacy/ecore/src/lib/ecore_txt/ecore_txt.c
View File

@ -26,7 +26,7 @@ ecore_txt_convert(const char *enc_from, const char *enc_to, const char *text)
new_txt = malloc(64);
inb = strlen(text);
outb = 64;
inp = text;
inp = (char*)text;
outp = new_txt;
outalloc = 64;
outlen = 0;
@ -39,7 +39,7 @@ ecore_txt_convert(const char *enc_from, const char *enc_to, const char *text)
tob = outb;
count = iconv(ic, &inp, &inb, &outp, &outb);
outlen += tob - outb;
if (count == -1)
if (count == (size_t)(-1))
{
if (errno == E2BIG)
{

3
legacy/ecore/src/lib/ecore_x/Ecore_X.h
View File

@ -1101,7 +1101,8 @@ EAPI void ecore_x_netwm_window_state_set(Ecore_X_Window win, Ecor
EAPI int ecore_x_netwm_window_state_isset(Ecore_X_Window win, Ecore_X_Window_State state);
EAPI void ecore_x_netwm_window_type_set(Ecore_X_Window win, Ecore_X_Window_Type type);
EAPI Ecore_X_Window_Type ecore_x_netwm_window_type_get(Ecore_X_Window win);
EAPI int ecore_x_netwm_action_allowed(Ecore_X_Window win, Ecore_X_Action action);
EAPI int ecore_x_netwm_allowed_action_isset(Ecore_X_Window win, Ecore_X_Action action);
EAPI void ecore_x_netwm_allowed_action_set(Ecore_X_Window win, Ecore_X_Action action, int on);
EAPI void ecore_x_netwm_opacity_set(Ecore_X_Window win, unsigned int opacity);
EAPI int ecore_x_netwm_opacity_get(Ecore_X_Window win, unsigned int *opacity);
EAPI void ecore_x_netwm_frame_size_set(Ecore_X_Window win, int fl, int fr, int ft, int fb);

15
legacy/ecore/src/lib/ecore_x/ecore_x.c
View File

@ -1,3 +1,4 @@
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_x_private.h"
#include "Ecore_X.h"
@ -563,7 +564,7 @@ ecore_x_kill(Ecore_X_Window win)
}
static int
_ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
_ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Display *d;
@ -583,7 +584,7 @@ _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
}
static int
_ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler)
_ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
{
Display *d;
@ -637,7 +638,7 @@ struct _Ecore_X_Filter_Data
};
static void *
_ecore_x_event_filter_start(void *data)
_ecore_x_event_filter_start(void *data __UNUSED__)
{
Ecore_X_Filter_Data *filter_data;
@ -646,7 +647,7 @@ _ecore_x_event_filter_start(void *data)
}
static int
_ecore_x_event_filter_filter(void *data, void *loop_data,int type, void *event)
_ecore_x_event_filter_filter(void *data __UNUSED__, void *loop_data,int type, void *event __UNUSED__)
{
Ecore_X_Filter_Data *filter_data;
@ -665,7 +666,7 @@ _ecore_x_event_filter_filter(void *data, void *loop_data,int type, void *event)
}
static void
_ecore_x_event_filter_end(void *data, void *loop_data)
_ecore_x_event_filter_end(void *data __UNUSED__, void *loop_data)
{
Ecore_X_Filter_Data *filter_data;
@ -815,7 +816,7 @@ static void _ecore_x_window_manage_error(void *data);
static int _ecore_x_window_manage_failed = 0;
static void
_ecore_x_window_manage_error(void *data)
_ecore_x_window_manage_error(void *data __UNUSED__)
{
if ((ecore_x_error_request_get() == X_ChangeWindowAttributes) &&
(ecore_x_error_code_get() == BadAccess))
@ -968,7 +969,7 @@ ecore_x_window_children_get(Ecore_X_Window win, int *num)
windows = malloc(children_ret_num * sizeof(Ecore_X_Window));
if (windows)
{
int i;
unsigned int i;
for (i = 0; i < children_ret_num; i++)
windows[i] = children_ret[i];

5
legacy/ecore/src/lib/ecore_x/ecore_x_error.c
View File

@ -1,3 +1,4 @@
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_x_private.h"
#include "Ecore_X.h"
@ -72,7 +73,7 @@ _ecore_x_error_handler_init(void)
}
static void
_ecore_x_error_handle(Display *d, XErrorEvent *ev)
_ecore_x_error_handle(Display *d __UNUSED__, XErrorEvent *ev)
{
_error_request_code = ev->request_code;
_error_code = ev->error_code;
@ -80,7 +81,7 @@ _ecore_x_error_handle(Display *d, XErrorEvent *ev)
}
static int
_ecore_x_io_error_handle(Display *d)
_ecore_x_io_error_handle(Display *d __UNUSED__)
{
if (_io_error_func) _io_error_func(_io_error_data);
else exit(-1);

35
legacy/ecore/src/lib/ecore_x/ecore_x_events.c
View File

@ -2,6 +2,7 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_x_private.h"
#include "Ecore_X.h"
@ -112,7 +113,7 @@ _ecore_x_event_free_window_prop_client_machine_change(void *data, void *ev)
#endif
static void
_ecore_x_event_free_key_down(void *data, void *ev)
_ecore_x_event_free_key_down(void *data __UNUSED__, void *ev)
{
Ecore_X_Event_Key_Down *e;
@ -124,7 +125,7 @@ _ecore_x_event_free_key_down(void *data, void *ev)
}
static void
_ecore_x_event_free_key_up(void *data, void *ev)
_ecore_x_event_free_key_up(void *data __UNUSED__, void *ev)
{
Ecore_X_Event_Key_Up *e;
@ -136,7 +137,7 @@ _ecore_x_event_free_key_up(void *data, void *ev)
}
static void
_ecore_x_event_free_selection_notify(void *data, void *ev)
_ecore_x_event_free_selection_notify(void *data __UNUSED__, void *ev)
{
Ecore_X_Event_Selection_Notify *e;
@ -350,12 +351,12 @@ _ecore_x_event_handle_button_press(XEvent *xevent)
else e->win = xevent->xbutton.window;
e->event_win = xevent->xbutton.window;
e->time = xevent->xbutton.time;
if (((e->time - last_time) <=
if (((int)(e->time - last_time) <=
(int)(1000 * _ecore_x_double_click_time)) &&
(e->win == last_win) &&
(e->event_win == last_event_win))
e->double_click = 1;
if (((e->time - last_last_time) <=
if (((int)(e->time - last_last_time) <=
(int)(2 * 1000 * _ecore_x_double_click_time)) &&
(e->win == last_win) && (e->win == last_last_win) &&
(e->event_win == last_event_win) && (e->event_win == last_last_event_win))
@ -661,7 +662,7 @@ _ecore_x_event_handle_focus_out(XEvent *xevent)
}
void
_ecore_x_event_handle_keymap_notify(XEvent *xevent)
_ecore_x_event_handle_keymap_notify(XEvent *xevent __UNUSED__)
{
/* FIXME: handle this event type */
}
@ -835,7 +836,7 @@ _ecore_x_event_handle_configure_request(XEvent *xevent)
}
void
_ecore_x_event_handle_gravity_notify(XEvent *xevent)
_ecore_x_event_handle_gravity_notify(XEvent *xevent __UNUSED__)
{
/* FIXME: handle this event type */
}
@ -855,13 +856,13 @@ _ecore_x_event_handle_resize_request(XEvent *xevent)
}
void
_ecore_x_event_handle_circulate_notify(XEvent *xevent)
_ecore_x_event_handle_circulate_notify(XEvent *xevent __UNUSED__)
{
/* FIXME: handle this event type */
}
void
_ecore_x_event_handle_circulate_request(XEvent *xevent)
_ecore_x_event_handle_circulate_request(XEvent *xevent __UNUSED__)
{
/* FIXME: handle this event type */
}
@ -1231,7 +1232,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
_xdnd = _ecore_x_dnd_protocol_get();
/* Make sure source/target match */
if (_xdnd->source != xevent->xclient.window
|| _xdnd->dest != xevent->xclient.data.l[0])
|| _xdnd->dest != (Window)xevent->xclient.data.l[0])
return;
_xdnd->will_accept = xevent->xclient.data.l[1] & 0x1UL;
_xdnd->suppress = (xevent->xclient.data.l[1] & 0x2UL) ? 0 : 1;
@ -1266,7 +1267,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
_xdnd = _ecore_x_dnd_protocol_get();
/* Match source/target */
if (_xdnd->source != xevent->xclient.data.l[0]
if (_xdnd->source != (Window)xevent->xclient.data.l[0]
|| _xdnd->dest != xevent->xclient.window)
return;
if (_xdnd->types)
@ -1289,12 +1290,12 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
_xdnd = _ecore_x_dnd_protocol_get();
/* Match source/target */
if (_xdnd->source != xevent->xclient.data.l[0]
if (_xdnd->source != (Window)xevent->xclient.data.l[0]
|| _xdnd->dest != xevent->xclient.window)
return;
timestamp = (_xdnd->version >= 1) ?
xevent->xclient.data.l[2] : _ecore_x_event_last_time;
timestamp = (_xdnd->version >= (int)1) ?
(Time)xevent->xclient.data.l[2] : _ecore_x_event_last_time;
XConvertSelection(_ecore_x_disp, ECORE_X_ATOM_SELECTION_XDND,
_xdnd->dest, ECORE_X_ATOM_SELECTION_PROP_XDND, _xdnd->dest,
@ -1324,7 +1325,7 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
_xdnd = _ecore_x_dnd_protocol_get();
/* Match source/target */
if (_xdnd->source != xevent->xclient.window
|| _xdnd->dest != xevent->xclient.data.l[0])
|| _xdnd->dest != (Window)xevent->xclient.data.l[0])
return;
if (_xdnd->version >= 5 && (xevent->xclient.data.l[1] & 0x1UL))
@ -1375,13 +1376,13 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
}
void
_ecore_x_event_handle_mapping_notify(XEvent *xevent)
_ecore_x_event_handle_mapping_notify(XEvent *xevent __UNUSED__)
{
/* FIXME: handle this event type */
}
void
_ecore_x_event_handle_shape_change(XEvent *xevent)
_ecore_x_event_handle_shape_change(XEvent *xevent __UNUSED__)
{
/* FIXME: handle this event type */
}

7
legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c
View File

@ -92,6 +92,7 @@ ecore_x_icccm_state_get(Ecore_X_Window win)
int format_ret;
Ecore_X_Window_State_Hint hint;
hint = ECORE_X_WINDOW_STATE_HINT_NONE;
XGetWindowProperty(_ecore_x_disp, win, ECORE_X_ATOM_WM_STATE,
0, 0x7fffffff, False, ECORE_X_ATOM_WM_STATE,
&type_ret, &format_ret, &num_ret, &bytes_after,
@ -105,8 +106,6 @@ ecore_x_icccm_state_get(Ecore_X_Window win)
else if (prop_ret[0] == IconicState)
hint = ECORE_X_WINDOW_STATE_HINT_ICONIC;
}
else
hint = ECORE_X_WINDOW_STATE_HINT_NORMAL;
if (prop_ret)
XFree(prop_ret);
@ -544,7 +543,7 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win,
int i;
/* Check for invalid values */
if (protocol < 0 || protocol >= ECORE_X_WM_PROTOCOL_NUM)
if (protocol >= ECORE_X_WM_PROTOCOL_NUM)
return;
proto = _ecore_x_atoms_wm_protocols[protocol];
@ -621,7 +620,7 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol)
int i, ret = 0, protos_count = 0;
/* check for invalid values */
if (protocol < 0 || protocol >= ECORE_X_WM_PROTOCOL_NUM)
if (protocol >= ECORE_X_WM_PROTOCOL_NUM)
return 0;
proto = _ecore_x_atoms_wm_protocols[protocol];

2
legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c
View File

@ -142,6 +142,7 @@ _ecore_x_window_prop_string_utf8_get(Ecore_X_Window win, Ecore_X_Atom atom)
return str;
}
#if 0 /* Unused */
/* Set/clear atom in list */
static void
_ecore_x_netwm_atom_list_set(Ecore_X_Atom *atoms, int size, int *count,
@ -172,6 +173,7 @@ _ecore_x_netwm_atom_list_set(Ecore_X_Atom *atoms, int size, int *count,
*count = n;
}
}
#endif
/*

8
legacy/ecore/src/lib/ecore_x/ecore_x_selection.c
View File

@ -6,8 +6,8 @@
#include "Ecore_X.h"
#include "Ecore_X_Atoms.h"
static Ecore_X_Selection_Data selections[3] = {{0}};
static Ecore_X_Selection_Data request_data[3] = {{0}};
static Ecore_X_Selection_Data selections[3];
static Ecore_X_Selection_Data request_data[3];
static Ecore_X_Selection_Converter *converters = NULL;
static int _ecore_x_selection_converter_text(char *target, void *data, int size, void **data_ret, int *size_ret);
@ -15,6 +15,10 @@ static int _ecore_x_selection_converter_text(char *target, void *data, int size,
void
_ecore_x_selection_data_init(void)
{
/* Initialize global data */
memset(selections, 0, sizeof(selections));
memset(request_data, 0, sizeof(request_data));
/* Initialize converters */
ecore_x_selection_converter_atom_add(ECORE_X_ATOM_TEXT,
_ecore_x_selection_converter_text);

4
legacy/ecore/src/lib/ecore_x/ecore_x_window_prop.c
View File

@ -496,7 +496,7 @@ ecore_x_window_prop_protocol_set(Ecore_X_Window win,
int i;
/* check for invalid values */
if (protocol < 0 || protocol >= ECORE_X_WM_PROTOCOL_NUM)
if (protocol >= ECORE_X_WM_PROTOCOL_NUM)
return;
proto = _ecore_x_atoms_wm_protocols[protocol];
@ -568,7 +568,7 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win,
int i, ret = 0, protos_count = 0;
/* check for invalid values */
if (protocol < 0 || protocol >= ECORE_X_WM_PROTOCOL_NUM)
if (protocol >= ECORE_X_WM_PROTOCOL_NUM)
return 0;
proto = _ecore_x_atoms_wm_protocols[protocol];