From 91e6ee5f6636719096524a9d1c068d70fa48dc4a Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sun, 5 Nov 2006 16:42:30 +0000 Subject: [PATCH] Add const, fix warnings. SVN revision: 26975 --- legacy/ecore/src/lib/ecore/Ecore_Data.h | 2 +- legacy/ecore/src/lib/ecore/ecore_events.c | 2 -- legacy/ecore/src/lib/ecore/ecore_exe.c | 37 ++++++++++++----------- legacy/ecore/src/lib/ecore/ecore_hash.c | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/legacy/ecore/src/lib/ecore/Ecore_Data.h b/legacy/ecore/src/lib/ecore/Ecore_Data.h index cb981428b3..20717267b8 100644 --- a/legacy/ecore/src/lib/ecore/Ecore_Data.h +++ b/legacy/ecore/src/lib/ecore/Ecore_Data.h @@ -243,7 +243,7 @@ extern "C" { /* Retrieve and store data into the hash */ EAPI void *ecore_hash_get(Ecore_Hash *hash, const void *key); EAPI int ecore_hash_set(Ecore_Hash *hash, void *key, void *value); - EAPI void *ecore_hash_remove(Ecore_Hash *hash, void *key); + EAPI void *ecore_hash_remove(Ecore_Hash *hash, const void *key); EAPI void ecore_hash_dump_graph(Ecore_Hash *hash); diff --git a/legacy/ecore/src/lib/ecore/ecore_events.c b/legacy/ecore/src/lib/ecore/ecore_events.c index 606cc5ca39..93466c4e09 100644 --- a/legacy/ecore/src/lib/ecore/ecore_events.c +++ b/legacy/ecore/src/lib/ecore/ecore_events.c @@ -380,8 +380,6 @@ _ecore_event_call(void) ef->loop_data = ef->func_start(ef->data); for (ll = (Ecore_List2 *)events; ll; ll = ll->next) { - Ecore_Event *e; - e = (Ecore_Event *)ll; if (!ef->func_filter(ef->loop_data, ef->data, e->type, e->event)) diff --git a/legacy/ecore/src/lib/ecore/ecore_exe.c b/legacy/ecore/src/lib/ecore/ecore_exe.c index b8647a0c02..dfdcc88904 100644 --- a/legacy/ecore/src/lib/ecore/ecore_exe.c +++ b/legacy/ecore/src/lib/ecore/ecore_exe.c @@ -52,12 +52,12 @@ EAPI int ECORE_EXE_EVENT_DATA = 0; EAPI int ECORE_EXE_EVENT_ERROR = 0; static Ecore_Exe *exes = NULL; -static char *shell = NULL; +static const char *shell = NULL; /* FIXME: This errno checking stuff should be put elsewhere for everybody to use. * For now it lives here though, just to make testing easier. */ -static int _ecore_exe_check_errno(int result, char *file, int line); +static int _ecore_exe_check_errno(int result, const char *file, int line); #define E_IF_NO_ERRNO(result, foo, ok) \ while (((ok) = _ecore_exe_check_errno( (result) = (foo), __FILE__, __LINE__)) == -1) sleep(1); \ @@ -70,7 +70,7 @@ static int _ecore_exe_check_errno(int result, char *file, int line); if (((ok) = _ecore_exe_check_errno( (result) = (foo), __FILE__, __LINE__))) static int -_ecore_exe_check_errno(int result, char *file, int line) +_ecore_exe_check_errno(int result, const char *file, int line) { int saved_errno = errno; @@ -306,7 +306,9 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) /* Create some pipes. */ if (ok) - E_IF_NO_ERRNO_NOLOOP(result, pipe(statusPipe), ok); + E_IF_NO_ERRNO_NOLOOP(result, pipe(statusPipe), ok) + { + } if (ok && (flags & ECORE_EXE_PIPE_ERROR)) E_IF_NO_ERRNO_NOLOOP(result, pipe(errorPipe), ok) { @@ -432,13 +434,13 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) { /* Setup the error stuff. */ E_IF_NO_ERRNO(result, fcntl(exe->child_fd_error, F_SETFL, - O_NONBLOCK), ok); + O_NONBLOCK), ok) {} E_IF_NO_ERRNO(result, fcntl(exe->child_fd_error, F_SETFD, - FD_CLOEXEC), ok); + FD_CLOEXEC), ok) {} E_IF_NO_ERRNO(result, fcntl(exe->child_fd_error_x, F_SETFD, - FD_CLOEXEC), ok); + FD_CLOEXEC), ok) {} { exe->error_fd_handler = ecore_main_fd_handler_add(exe->child_fd_error, @@ -453,13 +455,13 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) { /* Setup the read stuff. */ E_IF_NO_ERRNO(result, fcntl(exe->child_fd_read, F_SETFL, - O_NONBLOCK), ok); + O_NONBLOCK), ok) {} E_IF_NO_ERRNO(result, fcntl(exe->child_fd_read, F_SETFD, - FD_CLOEXEC), ok); + FD_CLOEXEC), ok) {} E_IF_NO_ERRNO(result, fcntl(exe->child_fd_read_x, F_SETFD, - FD_CLOEXEC), ok); + FD_CLOEXEC), ok) {} { exe->read_fd_handler = ecore_main_fd_handler_add(exe->child_fd_read, @@ -474,13 +476,13 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) { /* Setup the write stuff. */ E_IF_NO_ERRNO(result, fcntl(exe->child_fd_write, F_SETFL, - O_NONBLOCK), ok); + O_NONBLOCK), ok) {} E_IF_NO_ERRNO(result, fcntl(exe->child_fd_write, F_SETFD, - FD_CLOEXEC), ok); + FD_CLOEXEC), ok) {} E_IF_NO_ERRNO(result, fcntl(exe->child_fd_write_x, F_SETFD, - FD_CLOEXEC), ok); + FD_CLOEXEC), ok) {} { exe->write_fd_handler = ecore_main_fd_handler_add(exe->child_fd_write, @@ -549,7 +551,7 @@ ecore_exe_send(Ecore_Exe * exe, void *data, int size) return 0; exe->write_data_buf = buf; - memcpy(exe->write_data_buf + exe->write_data_size, data, size); + memcpy((char *)exe->write_data_buf + exe->write_data_size, data, size); exe->write_data_size += size; if (exe->write_fd_handler) @@ -1249,8 +1251,7 @@ _ecore_exe_exec_it(const char *exe_cmd, Ecore_Exe_Flags flags) if ((!token) && (num_tokens)) { int i = 0; - char *token; - + if (!(buf = strdup(exe_cmd))) return; @@ -1449,7 +1450,7 @@ _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler * fd_handler) } static int -_ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler * fd_handler) +_ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler * fd_handler __UNUSED__) { Ecore_Exe *exe; @@ -1491,7 +1492,7 @@ _ecore_exe_flush(Ecore_Exe * exe) return; count = write(exe->child_fd_write, - exe->write_data_buf + exe->write_data_offset, + (char *)exe->write_data_buf + exe->write_data_offset, exe->write_data_size - exe->write_data_offset); if (count < 1) { diff --git a/legacy/ecore/src/lib/ecore/ecore_hash.c b/legacy/ecore/src/lib/ecore/ecore_hash.c index 2c5d925a1f..f57655ad3b 100644 --- a/legacy/ecore/src/lib/ecore/ecore_hash.c +++ b/legacy/ecore/src/lib/ecore/ecore_hash.c @@ -386,7 +386,7 @@ ecore_hash_get(Ecore_Hash *hash, const void *key) * @ingroup Ecore_Data_Hash_ADT_Data_Group */ EAPI void * -ecore_hash_remove(Ecore_Hash *hash, void *key) +ecore_hash_remove(Ecore_Hash *hash, const void *key) { Ecore_Hash_Node *node = NULL; Ecore_Hash_Node *list;