diff options
| -rw-r--r-- | lib/e17/ecore/ecore-ffi.rb | 38 | ||||
| -rw-r--r-- | lib/e17/eet/eet-ffi.rb | 20 |
2 files changed, 29 insertions, 29 deletions
diff --git a/lib/e17/ecore/ecore-ffi.rb b/lib/e17/ecore/ecore-ffi.rb index 2baf672..7e94c97 100644 --- a/lib/e17/ecore/ecore-ffi.rb +++ b/lib/e17/ecore/ecore-ffi.rb @@ -111,7 +111,7 @@ module E17 # typedef void *(*Ecore_Data_Cb) (void *data); callback :ecore_data_cb, [ :void_p ], :void_p # typedef Eina_Bool (*Ecore_Filter_Cb) (void *data, void *loop_data, int type, void *event); - callback :ecore_filter_cb, [ :void_p, :void_p, :int, :void_p ], :uchar + callback :ecore_filter_cb, [ :void_p, :void_p, :int, :void_p ], :eina_bool # typedef int (*Ecore_Select_Function) (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); callback :ecore_select_function, [ :int, :pointer, :pointer, :pointer, :pointer ], :int # typedef void (*Ecore_End_Cb) (void *user_data, void *func_data); @@ -121,21 +121,21 @@ module E17 # typedef void (*Ecore_Exe_Cb) (void *data, const Ecore_Exe *exe); callback :ecore_exe_cb, [ :void_p, :ecore_exe_p ], :void # typedef Eina_Bool (*Ecore_Event_Handler_Cb) (void *data, int type, void *event); - callback :ecore_event_handler_cb, [ :void_p, :int, :void_p ], :uchar + callback :ecore_event_handler_cb, [ :void_p, :int, :void_p ], :eina_bool # typedef void (*Ecore_Thread_Cb) (void *data, Ecore_Thread *thread); callback :ecore_thread_cb, [ :void_p, :ecore_thread_p ], :void # typedef void (*Ecore_Thread_Notify_Cb) (void *data, Ecore_Thread *thread, void *msg_data); callback :ecore_thread_notify_cb, [ :void_p, :ecore_thread_p, :void_p ], :void # typedef Eina_Bool (*Ecore_Task_Cb) (void *data); - callback :ecore_task_cb, [ :void_p ], :uchar + callback :ecore_task_cb, [ :void_p ], :eina_bool # typedef void (*Ecore_Cb) (void *data); callback :ecore_cb, [ :void_p ], :void # typedef Eina_Bool (*Ecore_Fd_Cb) (void *data, Ecore_Fd_Handler *fd_handler); - callback :ecore_fd_cb, [ :void_p, :ecore_fd_handler_p ], :uchar + callback :ecore_fd_cb, [ :void_p, :ecore_fd_handler_p ], :eina_bool # typedef void (*Ecore_Fd_Prep_Cb) (void *data, Ecore_Fd_Handler *fd_handler); callback :ecore_fd_prep_cb, [ :void_p, :ecore_fd_handler_p ], :void # typedef Eina_Bool (*Ecore_Win32_Handle_Cb) (void *data, Ecore_Win32_Handler *wh); - callback :ecore_win32_handle_cb, [ :void_p, :ecore_win32_handler_p ], :uchar + callback :ecore_win32_handle_cb, [ :void_p, :ecore_win32_handler_p ], :eina_bool # # FUNCTIONS fcts = [ @@ -188,7 +188,7 @@ module E17 # EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func); [ :ecore_exe_callback_pre_free_set, [ :ecore_exe_p, :ecore_exe_cb ], :void ], # EAPI Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size); - [ :ecore_exe_send, [ :ecore_exe_p, :void_p, :int ], :uchar ], + [ :ecore_exe_send, [ :ecore_exe_p, :void_p, :int ], :eina_bool ], # EAPI void ecore_exe_close_stdin(Ecore_Exe *exe); [ :ecore_exe_close_stdin, [ :ecore_exe_p ], :void ], # EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines); @@ -248,7 +248,7 @@ module E17 # EAPI Ecore_Select_Function ecore_main_loop_select_func_get(void); [ :ecore_main_loop_select_func_get, [ ], :ecore_select_function ], # EAPI Eina_Bool ecore_main_loop_glib_integrate(void); - [ :ecore_main_loop_glib_integrate, [ ], :uchar ], + [ :ecore_main_loop_glib_integrate, [ ], :eina_bool ], # EAPI void ecore_main_loop_glib_always_integrate_disable(void); [ :ecore_main_loop_glib_always_integrate_disable, [ ], :void ], # EAPI void ecore_main_loop_begin(void); @@ -264,7 +264,7 @@ module E17 # EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler); [ :ecore_main_fd_handler_fd_get, [ :ecore_fd_handler_p ], :int ], # EAPI Eina_Bool 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_p, :ecore_fd_handler_flags ], :uchar ], + [ :ecore_main_fd_handler_active_get, [ :ecore_fd_handler_p, :ecore_fd_handler_flags ], :eina_bool ], # 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_p, :ecore_fd_handler_flags ], :void ], # EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data); @@ -276,7 +276,7 @@ module E17 # EAPI void *ecore_pipe_del(Ecore_Pipe *p); [ :ecore_pipe_del, [ :ecore_pipe_p ], :void_p ], # EAPI Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes); - [ :ecore_pipe_write, [ :ecore_pipe_p, :void_p, :uint ], :uchar ], + [ :ecore_pipe_write, [ :ecore_pipe_p, :void_p, :uint ], :eina_bool ], # EAPI void ecore_pipe_write_close(Ecore_Pipe *p); [ :ecore_pipe_write_close, [ :ecore_pipe_p ], :void ], # EAPI void ecore_pipe_read_close(Ecore_Pipe *p); @@ -284,16 +284,16 @@ module E17 # EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data); [ :ecore_thread_run, [ :ecore_thread_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p ], :ecore_thread_p ], # EAPI Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data, Eina_Bool try_no_queue); - [ :ecore_thread_feedback_run, [ :ecore_thread_cb, :ecore_thread_notify_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p, :uchar ], + [ :ecore_thread_feedback_run, [ :ecore_thread_cb, :ecore_thread_notify_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p, :eina_bool ], :ecore_thread_p ], # EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread); - [ :ecore_thread_cancel, [ :ecore_thread_p ], :uchar ], + [ :ecore_thread_cancel, [ :ecore_thread_p ], :eina_bool ], # EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread); - [ :ecore_thread_check, [ :ecore_thread_p ], :uchar ], + [ :ecore_thread_check, [ :ecore_thread_p ], :eina_bool ], # EAPI Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data); - [ :ecore_thread_feedback, [ :ecore_thread_p, :void_p ], :uchar ], + [ :ecore_thread_feedback, [ :ecore_thread_p, :void_p ], :eina_bool ], # EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread); - [ :ecore_thread_reschedule, [ :ecore_thread_p ], :uchar ], + [ :ecore_thread_reschedule, [ :ecore_thread_p ], :eina_bool ], # EAPI int ecore_thread_active_get(void); [ :ecore_thread_active_get, [ ], :int ], # EAPI int ecore_thread_pending_get(void); @@ -311,21 +311,21 @@ module E17 # EAPI int ecore_thread_available_get(void); [ :ecore_thread_available_get, [ ], :int ], # EAPI Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct); - [ :ecore_thread_local_data_add, [ :ecore_thread_p, :string, :void_p, :eina_free_cb, :uchar ], :uchar ], + [ :ecore_thread_local_data_add, [ :ecore_thread_p, :string, :void_p, :eina_free_cb, :eina_bool ], :eina_bool ], # EAPI void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb); [ :ecore_thread_local_data_set, [ :ecore_thread_p, :string, :void_p, :eina_free_cb ], :void_p ], # EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key); [ :ecore_thread_local_data_find, [ :ecore_thread_p, :string ], :void_p ], # EAPI Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key); - [ :ecore_thread_local_data_del, [ :ecore_thread_p, :string ], :uchar ], + [ :ecore_thread_local_data_del, [ :ecore_thread_p, :string ], :eina_bool ], # EAPI Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct); - [ :ecore_thread_global_data_add, [ :string, :void_p, :eina_free_cb, :uchar ], :uchar ], + [ :ecore_thread_global_data_add, [ :string, :void_p, :eina_free_cb, :eina_bool ], :eina_bool ], # EAPI void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb); [ :ecore_thread_global_data_set, [ :string, :void_p, :eina_free_cb ], :void_p ], # EAPI void *ecore_thread_global_data_find(const char *key); [ :ecore_thread_global_data_find, [ :string ], :void_p ], # EAPI Eina_Bool ecore_thread_global_data_del(const char *key); - [ :ecore_thread_global_data_del, [ :string ], :uchar ], + [ :ecore_thread_global_data_del, [ :string ], :eina_bool ], # EAPI void *ecore_thread_global_data_wait(const char *key, double seconds); [ :ecore_thread_global_data_wait, [ :string, :double ], :void_p ], # EAPI double ecore_time_get(void); @@ -373,7 +373,7 @@ module E17 # EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type); [ :ecore_poller_poll_interval_get, [ :ecore_poller_type ], :double ], # EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval); - [ :ecore_poller_poller_interval_set, [ :ecore_poller_p, :int ], :uchar ], + [ :ecore_poller_poller_interval_set, [ :ecore_poller_p, :int ], :eina_bool ], # EAPI int ecore_poller_poller_interval_get(Ecore_Poller *poller); [ :ecore_poller_poller_interval_get, [ :ecore_poller_p ], :int ], # EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data); diff --git a/lib/e17/eet/eet-ffi.rb b/lib/e17/eet/eet-ffi.rb index d38eca1..75f0c9d 100644 --- a/lib/e17/eet/eet-ffi.rb +++ b/lib/e17/eet/eet-ffi.rb @@ -90,9 +90,9 @@ module E17 # typedef void (*Eet_Descriptor_Str_Direct_Free_Callback) (const char *str); callback :eet_descriptor_str_direct_free_callback, [ :string ], :void # typedef const char *(*Eet_Descriptor_Type_Get_Callback) (const void *data, Eina_Bool *unknow); - callback :eet_descriptor_type_get_callback, [ :void_p, :uchar_p ], :string + callback :eet_descriptor_type_get_callback, [ :void_p, :eina_bool_p ], :string # typedef Eina_Bool (*Eet_Descriptor_Type_Set_Callback) (const char *type, void *data, Eina_Bool unknow); - callback :eet_descriptor_type_set_callback, [ :string, :void_p, :uchar ], :uchar + callback :eet_descriptor_type_set_callback, [ :string, :void_p, :eina_bool ], :eina_bool # typedef void *(*Eet_Descriptor_Array_Alloc_Callback) (size_t size); callback :eet_descriptor_array_alloc_callback, [ :ulong ], :void_p # typedef void (*Eet_Descriptor_Array_Free_Callback) (void *mem); @@ -104,7 +104,7 @@ module E17 # typedef void (*Eet_Node_Walk_Struct_Add_Callback) (void *parent, const char *name, void *child, void *user_data); callback :eet_node_walk_struct_add_callback, [ :void_p, :string, :void_p, :void_p ], :void # typedef void *(*Eet_Node_Walk_Array_Callback) (Eina_Bool variable, const char *name, int count, void *user_data); - callback :eet_node_walk_array_callback, [ :uchar, :string, :int, :void_p ], :void_p + callback :eet_node_walk_array_callback, [ :eina_bool, :string, :int, :void_p ], :void_p # typedef void (*Eet_Node_Walk_Insert_Callback) (void *array, int index, void *child, void *user_data); callback :eet_node_walk_insert_callback, [ :void_p, :int, :void_p, :void_p ], :void # typedef void *(*Eet_Node_Walk_List_Callback) (const char *name, void *user_data); @@ -116,9 +116,9 @@ module E17 # typedef void *(*Eet_Node_Walk_Simple_Callback) (int type, Eet_Node_Data *data, void *user_data); callback :eet_node_walk_simple_callback, [ :int, :eet_node_data_p, :void_p ], :void_p # typedef Eina_Bool Eet_Read_Cb (const void *eet_data, size_t size, void *user_data); - callback :eet_read_cb, [ :void_p, :ulong, :void_p ], :uchar + callback :eet_read_cb, [ :void_p, :ulong, :void_p ], :eina_bool # typedef Eina_Bool Eet_Write_Cb (const void *data, size_t size, void *user_data); - callback :eet_write_cb, [ :void_p, :ulong, :void_p ], :uchar + callback :eet_write_cb, [ :void_p, :ulong, :void_p ], :eina_bool # # FUNCTIONS fcts = [ @@ -153,7 +153,7 @@ module E17 # EAPI int eet_delete(Eet_File *ef, const char *name); [ :eet_delete, [ :eet_file_p, :string ], :int ], # EAPI Eina_Bool eet_alias(Eet_File *ef, const char *name, const char *destination, int compress); - [ :eet_alias, [ :eet_file_p, :string, :string, :int ], :uchar ], + [ :eet_alias, [ :eet_file_p, :string, :string, :int ], :eina_bool ], # EAPI char ** eet_list(Eet_File *ef, const char *glob, int *count_ret); [ :eet_list, [ :eet_file_p, :string, :int_p ], :string_array ], # EAPI int eet_num_entries(Eet_File *ef); @@ -220,7 +220,7 @@ module E17 # EAPI Eina_Bool eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, unsigned int eddc_size, const char *name, int size); # FIXME # EAPI Eina_Bool eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, unsigned int eddc_size, const char *name, int size); - [ :eet_eina_file_data_descriptor_class_set, [ :eet_data_descriptor_class_p, :uint, :string, :int ], :uchar ], + [ :eet_eina_file_data_descriptor_class_set, [ :eet_data_descriptor_class_p, :uint, :string, :int ], :eina_bool ], # EAPI void eet_data_descriptor_free(Eet_Data_Descriptor *edd); [ :eet_data_descriptor_free, [ :eet_data_descriptor_p ], :void ], # EAPI void eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, const char *name, int type, int group_type, int offset, /* int count_offset, */ @@ -320,11 +320,11 @@ module E17 # EAPI int eet_connection_received(Eet_Connection *conn, const void *data, size_t size); [ :eet_connection_received, [ :eet_connection_p, :void_p, :ulong ], :int ], # EAPI Eina_Bool eet_connection_send(Eet_Connection *conn, Eet_Data_Descriptor *edd, const void *data_in, const char *cipher_key); - [ :eet_connection_send, [ :eet_connection_p, :eet_data_descriptor_p, :void_p, :string ], :uchar ], + [ :eet_connection_send, [ :eet_connection_p, :eet_data_descriptor_p, :void_p, :string ], :eina_bool ], # EAPI Eina_Bool eet_connection_node_send(Eet_Connection *conn, Eet_Node *node, const char *cipher_key); - [ :eet_connection_node_send, [ :eet_connection_p, :eet_node_p, :string ], :uchar ], + [ :eet_connection_node_send, [ :eet_connection_p, :eet_node_p, :string ], :eina_bool ], # EAPI void * eet_connection_close(Eet_Connection *conn, Eina_Bool *on_going); - [ :eet_connection_close, [ :eet_connection_p, :uchar_p ], :void_p ], + [ :eet_connection_close, [ :eet_connection_p, :eina_bool_p ], :void_p ], ] # attach_fcts fcts |