From d59779b309cb74323dca8d2ef2ec95509f4e0acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20K=C3=B6ditz?= Date: Wed, 20 Nov 2024 22:02:28 +0100 Subject: [PATCH] Cleaned up code to remove compiler warnings. --- ibase_blobs.dep | 100 +++++++++++++++++++++++++++++ ibase_events.c | 30 ++++----- ibase_events.dep | 100 +++++++++++++++++++++++++++++ ibase_query.dep | 142 +++++++++++++++++++++++++++++++++++++++++ ibase_service.dep | 100 +++++++++++++++++++++++++++++ interbase.c | 5 +- interbase.dep | 146 +++++++++++++++++++++++++++++++++++++++++++ php_ibase_includes.h | 2 +- php_interbase.h | 4 +- 9 files changed, 610 insertions(+), 19 deletions(-) create mode 100644 ibase_blobs.dep create mode 100644 ibase_events.dep create mode 100644 ibase_query.dep create mode 100644 ibase_service.dep create mode 100644 interbase.dep diff --git a/ibase_blobs.dep b/ibase_blobs.dep new file mode 100644 index 0000000..542ec37 --- /dev/null +++ b/ibase_blobs.dep @@ -0,0 +1,100 @@ +ibase_blobs.lo: /home/koeditzm/Entwicklung/php-firebird/ibase_blobs.c \ + /home/koeditzm/Entwicklung/php-firebird/config.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_version.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_types.h \ + /usr/include/php/20210902/Zend/zend_portability.h \ + /usr/include/php/20210902/Zend/zend_config.h \ + /usr/include/php/20210902/main/../main/php_config.h \ + /usr/include/php/20210902/Zend/../TSRM/TSRM.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_range_check.h \ + /usr/include/php/20210902/Zend/zend_long.h \ + /usr/include/php/20210902/Zend/zend_map_ptr.h \ + /usr/include/php/20210902/Zend/zend_errors.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_alloc_sizes.h \ + /usr/include/php/20210902/Zend/zend_llist.h \ + /usr/include/php/20210902/Zend/zend_string.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_ast.h \ + /usr/include/php/20210902/Zend/zend_gc.h \ + /usr/include/php/20210902/Zend/zend_variables.h \ + /usr/include/php/20210902/Zend/zend_iterators.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/Zend/zend_signal.h \ + /usr/include/php/20210902/Zend/zend_max_execution_timer.h \ + /usr/include/php/20210902/Zend/zend_object_handlers.h \ + /usr/include/php/20210902/Zend/zend_operators.h \ + /usr/include/php/20210902/Zend/zend_strtod.h \ + /usr/include/php/20210902/Zend/zend_multiply.h \ + /usr/include/php/20210902/Zend/zend_sort.h \ + /usr/include/php/20210902/main/php_compat.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/Zend/zend_API.h \ + /usr/include/php/20210902/Zend/zend_modules.h \ + /usr/include/php/20210902/Zend/zend_compile.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/Zend/zend_globals_macros.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/Zend/zend_ptr_stack.h \ + /usr/include/php/20210902/Zend/zend_objects.h \ + /usr/include/php/20210902/Zend/zend_objects_API.h \ + /usr/include/php/20210902/Zend/zend_float.h \ + /usr/include/php/20210902/Zend/zend_multibyte.h \ + /usr/include/php/20210902/Zend/zend_arena.h \ + /usr/include/php/20210902/Zend/zend_vm_opcodes.h \ + /usr/include/php/20210902/Zend/zend_build.h \ + /usr/include/php/20210902/Zend/zend_list.h \ + /usr/include/php/20210902/Zend/zend_execute.h \ + /usr/include/php/20210902/Zend/zend_type_info.h \ + /usr/include/php/20210902/main/build-defs.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/main/snprintf.h \ + /usr/include/php/20210902/main/spprintf.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/main/php_syslog.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_output.h \ + /usr/include/php/20210902/main/php_streams.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/main/streams/php_stream_context.h \ + /usr/include/php/20210902/main/streams/php_stream_filter_api.h \ + /usr/include/php/20210902/main/streams/php_stream_transport.h \ + /usr/include/php/20210902/main/streams/php_stream_plain_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_glob_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_userspace.h \ + /usr/include/php/20210902/main/streams/php_stream_mmap.h \ + /usr/include/php/20210902/main/php_memory_streams.h \ + /usr/include/php/20210902/main/fopen_wrappers.h \ + /usr/include/php/20210902/main/php_globals.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/main/php_ini.h \ + /usr/include/php/20210902/Zend/zend_ini.h \ + /usr/include/php/20210902/Zend/zend_virtual_cwd.h \ + /usr/include/php/20210902/TSRM/TSRM.h \ + /usr/include/php/20210902/Zend/zend_constants.h \ + /usr/include/php/20210902/main/php_reentrancy.h \ + /home/koeditzm/Entwicklung/php-firebird/php_interbase.h \ + /usr/include/php/20210902/main/php_version.h \ + /home/koeditzm/Entwicklung/php-firebird/php_ibase_includes.h \ + /opt/firebird/include/ibase.h \ + /opt/firebird/include/./firebird/impl/types_pub.h \ + /opt/firebird/include/./firebird/impl/dsc_pub.h \ + /opt/firebird/include/./firebird/impl/sqlda_pub.h \ + /opt/firebird/include/./firebird/impl/blr.h \ + /opt/firebird/include/./firebird/impl/consts_pub.h \ + /opt/firebird/include/./firebird/impl/inf_pub.h \ + /opt/firebird/include/./iberror.h \ + /opt/firebird/include/./firebird/impl/msg_helper.h \ + /opt/firebird/include/./firebird/impl/iberror_c.h diff --git a/ibase_events.c b/ibase_events.c index 46a02ff..4da5dad 100644 --- a/ibase_events.c +++ b/ibase_events.c @@ -42,7 +42,7 @@ static int le_event; -static void _php_ibase_event_free(char *event_buf, char *result_buf) /* {{{ */ +static void _php_ibase_event_free(unsigned char *event_buf, unsigned char *result_buf) /* {{{ */ { isc_free(event_buf); isc_free(result_buf); @@ -90,7 +90,6 @@ static void _php_ibase_free_event_rsrc(zend_resource *rsrc) /* {{{ */ ibase_event *e = (ibase_event *) rsrc->ptr; _php_ibase_free_event(e); - efree(e); } /* }}} */ @@ -102,13 +101,13 @@ void php_ibase_events_minit(INIT_FUNC_ARGS) /* {{{ */ } /* }}} */ -static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count, /* {{{ */ - char **events, unsigned short *l, char **event_buf, char **result_buf) +static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count, + char **events, unsigned short *l, unsigned char **event_buf, unsigned char **result_buf) { - ISC_STATUS dummy_result[20]; - ISC_ULONG dummy_count[15]; + ISC_STATUS dummy_result[20]; + ISC_ULONG dummy_count[15]; - /** + /** * Unfortunately, there's no clean and portable way in C to pass arguments to * a variadic function if you don't know the number of arguments at compile time. * (And even if there were a way, the Interbase API doesn't provide a version of @@ -118,11 +117,11 @@ static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count, * so we can work around it. */ - *l = (unsigned short) isc_event_block(event_buf, result_buf, count, events[0], - events[1], events[2], events[3], events[4], events[5], events[6], events[7], - events[8], events[9], events[10], events[11], events[12], events[13], events[14]); + *l = (unsigned short) isc_event_block(event_buf, result_buf, count, events[0], + events[1], events[2], events[3], events[4], events[5], events[6], events[7], + events[8], events[9], events[10], events[11], events[12], events[13], events[14]); - /** + /** * Currently, this is the only way to correctly initialize an event buffer. * This is clearly something that should be fixed, cause the semantics of * isc_wait_for_event() indicate that it blocks until an event occurs. @@ -130,8 +129,8 @@ static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count, * otherwise, events will have to fire twice before ibase_wait_event() returns. */ - isc_wait_for_event(dummy_result, &ib_link->handle, *l, *event_buf, *result_buf); - isc_event_counts(dummy_count, *l, *event_buf, *result_buf); + isc_wait_for_event(dummy_result, &ib_link->handle, *l, *event_buf, *result_buf); + isc_event_counts(dummy_count, *l, *event_buf, *result_buf); } /* }}} */ @@ -142,7 +141,8 @@ PHP_FUNCTION(ibase_wait_event) zval *args; ibase_db_link *ib_link; int num_args; - char *event_buffer, *result_buffer, *events[15]; + unsigned char *event_buffer, *result_buffer; + char *events[15]; unsigned short i = 0, event_count = 0, buffer_size; ISC_ULONG occurred_event[15]; @@ -210,7 +210,7 @@ static ISC_EVENT_CALLBACK _php_ibase_callback(ibase_event *event, /* {{{ */ #else #define PHP_ISC_CALLBACK isc_callback static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */ - unsigned short buffer_size, char *result_buf) + unsigned short buffer_size, unsigned char *result_buf) #endif { /* this function is called asynchronously by the Interbase client library. */ diff --git a/ibase_events.dep b/ibase_events.dep new file mode 100644 index 0000000..a2513ae --- /dev/null +++ b/ibase_events.dep @@ -0,0 +1,100 @@ +ibase_events.lo: /home/koeditzm/Entwicklung/php-firebird/ibase_events.c \ + /home/koeditzm/Entwicklung/php-firebird/config.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_version.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_types.h \ + /usr/include/php/20210902/Zend/zend_portability.h \ + /usr/include/php/20210902/Zend/zend_config.h \ + /usr/include/php/20210902/main/../main/php_config.h \ + /usr/include/php/20210902/Zend/../TSRM/TSRM.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_range_check.h \ + /usr/include/php/20210902/Zend/zend_long.h \ + /usr/include/php/20210902/Zend/zend_map_ptr.h \ + /usr/include/php/20210902/Zend/zend_errors.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_alloc_sizes.h \ + /usr/include/php/20210902/Zend/zend_llist.h \ + /usr/include/php/20210902/Zend/zend_string.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_ast.h \ + /usr/include/php/20210902/Zend/zend_gc.h \ + /usr/include/php/20210902/Zend/zend_variables.h \ + /usr/include/php/20210902/Zend/zend_iterators.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/Zend/zend_signal.h \ + /usr/include/php/20210902/Zend/zend_max_execution_timer.h \ + /usr/include/php/20210902/Zend/zend_object_handlers.h \ + /usr/include/php/20210902/Zend/zend_operators.h \ + /usr/include/php/20210902/Zend/zend_strtod.h \ + /usr/include/php/20210902/Zend/zend_multiply.h \ + /usr/include/php/20210902/Zend/zend_sort.h \ + /usr/include/php/20210902/main/php_compat.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/Zend/zend_API.h \ + /usr/include/php/20210902/Zend/zend_modules.h \ + /usr/include/php/20210902/Zend/zend_compile.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/Zend/zend_globals_macros.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/Zend/zend_ptr_stack.h \ + /usr/include/php/20210902/Zend/zend_objects.h \ + /usr/include/php/20210902/Zend/zend_objects_API.h \ + /usr/include/php/20210902/Zend/zend_float.h \ + /usr/include/php/20210902/Zend/zend_multibyte.h \ + /usr/include/php/20210902/Zend/zend_arena.h \ + /usr/include/php/20210902/Zend/zend_vm_opcodes.h \ + /usr/include/php/20210902/Zend/zend_build.h \ + /usr/include/php/20210902/Zend/zend_list.h \ + /usr/include/php/20210902/Zend/zend_execute.h \ + /usr/include/php/20210902/Zend/zend_type_info.h \ + /usr/include/php/20210902/main/build-defs.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/main/snprintf.h \ + /usr/include/php/20210902/main/spprintf.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/main/php_syslog.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_output.h \ + /usr/include/php/20210902/main/php_streams.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/main/streams/php_stream_context.h \ + /usr/include/php/20210902/main/streams/php_stream_filter_api.h \ + /usr/include/php/20210902/main/streams/php_stream_transport.h \ + /usr/include/php/20210902/main/streams/php_stream_plain_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_glob_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_userspace.h \ + /usr/include/php/20210902/main/streams/php_stream_mmap.h \ + /usr/include/php/20210902/main/php_memory_streams.h \ + /usr/include/php/20210902/main/fopen_wrappers.h \ + /usr/include/php/20210902/main/php_globals.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/main/php_ini.h \ + /usr/include/php/20210902/Zend/zend_ini.h \ + /usr/include/php/20210902/Zend/zend_virtual_cwd.h \ + /usr/include/php/20210902/TSRM/TSRM.h \ + /usr/include/php/20210902/Zend/zend_constants.h \ + /usr/include/php/20210902/main/php_reentrancy.h \ + /home/koeditzm/Entwicklung/php-firebird/php_interbase.h \ + /usr/include/php/20210902/main/php_version.h \ + /home/koeditzm/Entwicklung/php-firebird/php_ibase_includes.h \ + /opt/firebird/include/ibase.h \ + /opt/firebird/include/./firebird/impl/types_pub.h \ + /opt/firebird/include/./firebird/impl/dsc_pub.h \ + /opt/firebird/include/./firebird/impl/sqlda_pub.h \ + /opt/firebird/include/./firebird/impl/blr.h \ + /opt/firebird/include/./firebird/impl/consts_pub.h \ + /opt/firebird/include/./firebird/impl/inf_pub.h \ + /opt/firebird/include/./iberror.h \ + /opt/firebird/include/./firebird/impl/msg_helper.h \ + /opt/firebird/include/./firebird/impl/iberror_c.h diff --git a/ibase_query.dep b/ibase_query.dep new file mode 100644 index 0000000..2f8e2a5 --- /dev/null +++ b/ibase_query.dep @@ -0,0 +1,142 @@ +ibase_query.lo: /home/koeditzm/Entwicklung/php-firebird/ibase_query.c \ + /home/koeditzm/Entwicklung/php-firebird/config.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_version.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_types.h \ + /usr/include/php/20210902/Zend/zend_portability.h \ + /usr/include/php/20210902/Zend/zend_config.h \ + /usr/include/php/20210902/main/../main/php_config.h \ + /usr/include/php/20210902/Zend/../TSRM/TSRM.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_range_check.h \ + /usr/include/php/20210902/Zend/zend_long.h \ + /usr/include/php/20210902/Zend/zend_map_ptr.h \ + /usr/include/php/20210902/Zend/zend_errors.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_alloc_sizes.h \ + /usr/include/php/20210902/Zend/zend_llist.h \ + /usr/include/php/20210902/Zend/zend_string.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_ast.h \ + /usr/include/php/20210902/Zend/zend_gc.h \ + /usr/include/php/20210902/Zend/zend_variables.h \ + /usr/include/php/20210902/Zend/zend_iterators.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/Zend/zend_signal.h \ + /usr/include/php/20210902/Zend/zend_max_execution_timer.h \ + /usr/include/php/20210902/Zend/zend_object_handlers.h \ + /usr/include/php/20210902/Zend/zend_operators.h \ + /usr/include/php/20210902/Zend/zend_strtod.h \ + /usr/include/php/20210902/Zend/zend_multiply.h \ + /usr/include/php/20210902/Zend/zend_sort.h \ + /usr/include/php/20210902/main/php_compat.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/Zend/zend_API.h \ + /usr/include/php/20210902/Zend/zend_modules.h \ + /usr/include/php/20210902/Zend/zend_compile.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/Zend/zend_globals_macros.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/Zend/zend_ptr_stack.h \ + /usr/include/php/20210902/Zend/zend_objects.h \ + /usr/include/php/20210902/Zend/zend_objects_API.h \ + /usr/include/php/20210902/Zend/zend_float.h \ + /usr/include/php/20210902/Zend/zend_multibyte.h \ + /usr/include/php/20210902/Zend/zend_arena.h \ + /usr/include/php/20210902/Zend/zend_vm_opcodes.h \ + /usr/include/php/20210902/Zend/zend_build.h \ + /usr/include/php/20210902/Zend/zend_list.h \ + /usr/include/php/20210902/Zend/zend_execute.h \ + /usr/include/php/20210902/Zend/zend_type_info.h \ + /usr/include/php/20210902/main/build-defs.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/main/snprintf.h \ + /usr/include/php/20210902/main/spprintf.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/main/php_syslog.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_output.h \ + /usr/include/php/20210902/main/php_streams.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/main/streams/php_stream_context.h \ + /usr/include/php/20210902/main/streams/php_stream_filter_api.h \ + /usr/include/php/20210902/main/streams/php_stream_transport.h \ + /usr/include/php/20210902/main/streams/php_stream_plain_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_glob_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_userspace.h \ + /usr/include/php/20210902/main/streams/php_stream_mmap.h \ + /usr/include/php/20210902/main/php_memory_streams.h \ + /usr/include/php/20210902/main/fopen_wrappers.h \ + /usr/include/php/20210902/main/php_globals.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/main/php_ini.h \ + /usr/include/php/20210902/Zend/zend_ini.h \ + /usr/include/php/20210902/Zend/zend_virtual_cwd.h \ + /usr/include/php/20210902/TSRM/TSRM.h \ + /usr/include/php/20210902/Zend/zend_constants.h \ + /usr/include/php/20210902/main/php_reentrancy.h \ + /usr/include/php/20210902/main/php_ini.h \ + /usr/include/php/20210902/ext/standard/php_standard.h \ + /usr/include/php/20210902/ext/standard/basic_functions.h \ + /usr/include/php/20210902/ext/standard/php_filestat.h \ + /usr/include/php/20210902/Zend/zend_highlight.h \ + /usr/include/php/20210902/ext/standard/url_scanner_ex.h \ + /usr/include/php/20210902/ext/standard/php_math.h \ + /usr/include/php/20210902/ext/standard/php_string.h \ + /usr/include/php/20210902/ext/standard/base64.h \ + /usr/include/php/20210902/ext/standard/php_dir.h \ + /usr/include/php/20210902/ext/standard/php_dns.h \ + /usr/include/php/20210902/ext/standard/php_mail.h \ + /usr/include/php/20210902/ext/standard/md5.h \ + /usr/include/php/20210902/ext/standard/basic_functions.h \ + /usr/include/php/20210902/ext/standard/sha1.h \ + /usr/include/php/20210902/ext/standard/hrtime.h \ + /usr/include/php/20210902/ext/standard/html.h \ + /usr/include/php/20210902/ext/standard/exec.h \ + /usr/include/php/20210902/ext/standard/file.h \ + /usr/include/php/20210902/main/php_network.h \ + /usr/include/php/20210902/ext/standard/php_ext_syslog.h \ + /usr/include/php/20210902/main/php_syslog.h \ + /usr/include/php/20210902/ext/standard/php_browscap.h \ + /usr/include/php/20210902/ext/standard/pack.h \ + /usr/include/php/20210902/ext/standard/datetime.h \ + /usr/include/php/20210902/ext/standard/url.h \ + /usr/include/php/20210902/ext/standard/pageinfo.h \ + /usr/include/php/20210902/ext/standard/fsock.h \ + /usr/include/php/20210902/ext/standard/php_image.h \ + /usr/include/php/20210902/ext/standard/info.h \ + /usr/include/php/20210902/ext/standard/php_var.h \ + /usr/include/php/20210902/ext/standard/quot_print.h \ + /usr/include/php/20210902/ext/standard/dl.h \ + /usr/include/php/20210902/ext/standard/php_crypt.h \ + /usr/include/php/20210902/ext/standard/head.h \ + /usr/include/php/20210902/ext/standard/php_lcg.h \ + /usr/include/php/20210902/main/php_output.h \ + /usr/include/php/20210902/ext/standard/php_array.h \ + /usr/include/php/20210902/ext/standard/php_assert.h \ + /usr/include/php/20210902/ext/standard/php_versioning.h \ + /usr/include/php/20210902/ext/standard/php_password.h \ + /usr/include/php/20210902/ext/standard/php_random.h \ + /usr/include/php/20210902/main/php_version.h \ + /home/koeditzm/Entwicklung/php-firebird/php_interbase.h \ + /home/koeditzm/Entwicklung/php-firebird/php_ibase_includes.h \ + /opt/firebird/include/ibase.h \ + /opt/firebird/include/./firebird/impl/types_pub.h \ + /opt/firebird/include/./firebird/impl/dsc_pub.h \ + /opt/firebird/include/./firebird/impl/sqlda_pub.h \ + /opt/firebird/include/./firebird/impl/blr.h \ + /opt/firebird/include/./firebird/impl/consts_pub.h \ + /opt/firebird/include/./firebird/impl/inf_pub.h \ + /opt/firebird/include/./iberror.h \ + /opt/firebird/include/./firebird/impl/msg_helper.h \ + /opt/firebird/include/./firebird/impl/iberror_c.h diff --git a/ibase_service.dep b/ibase_service.dep new file mode 100644 index 0000000..72de91e --- /dev/null +++ b/ibase_service.dep @@ -0,0 +1,100 @@ +ibase_service.lo: /home/koeditzm/Entwicklung/php-firebird/ibase_service.c \ + /home/koeditzm/Entwicklung/php-firebird/config.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_version.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_types.h \ + /usr/include/php/20210902/Zend/zend_portability.h \ + /usr/include/php/20210902/Zend/zend_config.h \ + /usr/include/php/20210902/main/../main/php_config.h \ + /usr/include/php/20210902/Zend/../TSRM/TSRM.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_range_check.h \ + /usr/include/php/20210902/Zend/zend_long.h \ + /usr/include/php/20210902/Zend/zend_map_ptr.h \ + /usr/include/php/20210902/Zend/zend_errors.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_alloc_sizes.h \ + /usr/include/php/20210902/Zend/zend_llist.h \ + /usr/include/php/20210902/Zend/zend_string.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_ast.h \ + /usr/include/php/20210902/Zend/zend_gc.h \ + /usr/include/php/20210902/Zend/zend_variables.h \ + /usr/include/php/20210902/Zend/zend_iterators.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/Zend/zend_signal.h \ + /usr/include/php/20210902/Zend/zend_max_execution_timer.h \ + /usr/include/php/20210902/Zend/zend_object_handlers.h \ + /usr/include/php/20210902/Zend/zend_operators.h \ + /usr/include/php/20210902/Zend/zend_strtod.h \ + /usr/include/php/20210902/Zend/zend_multiply.h \ + /usr/include/php/20210902/Zend/zend_sort.h \ + /usr/include/php/20210902/main/php_compat.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/Zend/zend_API.h \ + /usr/include/php/20210902/Zend/zend_modules.h \ + /usr/include/php/20210902/Zend/zend_compile.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/Zend/zend_globals_macros.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/Zend/zend_ptr_stack.h \ + /usr/include/php/20210902/Zend/zend_objects.h \ + /usr/include/php/20210902/Zend/zend_objects_API.h \ + /usr/include/php/20210902/Zend/zend_float.h \ + /usr/include/php/20210902/Zend/zend_multibyte.h \ + /usr/include/php/20210902/Zend/zend_arena.h \ + /usr/include/php/20210902/Zend/zend_vm_opcodes.h \ + /usr/include/php/20210902/Zend/zend_build.h \ + /usr/include/php/20210902/Zend/zend_list.h \ + /usr/include/php/20210902/Zend/zend_execute.h \ + /usr/include/php/20210902/Zend/zend_type_info.h \ + /usr/include/php/20210902/main/build-defs.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/main/snprintf.h \ + /usr/include/php/20210902/main/spprintf.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/main/php_syslog.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_output.h \ + /usr/include/php/20210902/main/php_streams.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/main/streams/php_stream_context.h \ + /usr/include/php/20210902/main/streams/php_stream_filter_api.h \ + /usr/include/php/20210902/main/streams/php_stream_transport.h \ + /usr/include/php/20210902/main/streams/php_stream_plain_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_glob_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_userspace.h \ + /usr/include/php/20210902/main/streams/php_stream_mmap.h \ + /usr/include/php/20210902/main/php_memory_streams.h \ + /usr/include/php/20210902/main/fopen_wrappers.h \ + /usr/include/php/20210902/main/php_globals.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/main/php_ini.h \ + /usr/include/php/20210902/Zend/zend_ini.h \ + /usr/include/php/20210902/Zend/zend_virtual_cwd.h \ + /usr/include/php/20210902/TSRM/TSRM.h \ + /usr/include/php/20210902/Zend/zend_constants.h \ + /usr/include/php/20210902/main/php_reentrancy.h \ + /home/koeditzm/Entwicklung/php-firebird/php_interbase.h \ + /usr/include/php/20210902/main/php_version.h \ + /home/koeditzm/Entwicklung/php-firebird/php_ibase_includes.h \ + /opt/firebird/include/ibase.h \ + /opt/firebird/include/./firebird/impl/types_pub.h \ + /opt/firebird/include/./firebird/impl/dsc_pub.h \ + /opt/firebird/include/./firebird/impl/sqlda_pub.h \ + /opt/firebird/include/./firebird/impl/blr.h \ + /opt/firebird/include/./firebird/impl/consts_pub.h \ + /opt/firebird/include/./firebird/impl/inf_pub.h \ + /opt/firebird/include/./iberror.h \ + /opt/firebird/include/./firebird/impl/msg_helper.h \ + /opt/firebird/include/./firebird/impl/iberror_c.h diff --git a/interbase.c b/interbase.c index 712c31c..f34d59b 100644 --- a/interbase.c +++ b/interbase.c @@ -27,9 +27,12 @@ #include "config.h" #endif +#include "php.h" + +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif -#include "php.h" #if HAVE_IBASE diff --git a/interbase.dep b/interbase.dep new file mode 100644 index 0000000..7792ee7 --- /dev/null +++ b/interbase.dep @@ -0,0 +1,146 @@ +interbase.lo: /home/koeditzm/Entwicklung/php-firebird/interbase.c \ + /home/koeditzm/Entwicklung/php-firebird/config.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_version.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_types.h \ + /usr/include/php/20210902/Zend/zend_portability.h \ + /usr/include/php/20210902/Zend/zend_config.h \ + /usr/include/php/20210902/main/../main/php_config.h \ + /usr/include/php/20210902/Zend/../TSRM/TSRM.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_range_check.h \ + /usr/include/php/20210902/Zend/zend_long.h \ + /usr/include/php/20210902/Zend/zend_map_ptr.h \ + /usr/include/php/20210902/Zend/zend_errors.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend.h \ + /usr/include/php/20210902/Zend/zend_alloc_sizes.h \ + /usr/include/php/20210902/Zend/zend_llist.h \ + /usr/include/php/20210902/Zend/zend_string.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_ast.h \ + /usr/include/php/20210902/Zend/zend_gc.h \ + /usr/include/php/20210902/Zend/zend_variables.h \ + /usr/include/php/20210902/Zend/zend_iterators.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/Zend/zend_signal.h \ + /usr/include/php/20210902/Zend/zend_max_execution_timer.h \ + /usr/include/php/20210902/Zend/zend_object_handlers.h \ + /usr/include/php/20210902/Zend/zend_operators.h \ + /usr/include/php/20210902/Zend/zend_strtod.h \ + /usr/include/php/20210902/Zend/zend_multiply.h \ + /usr/include/php/20210902/Zend/zend_sort.h \ + /usr/include/php/20210902/main/php_compat.h \ + /usr/include/php/20210902/main/php_config.h \ + /usr/include/php/20210902/Zend/zend_API.h \ + /usr/include/php/20210902/Zend/zend_modules.h \ + /usr/include/php/20210902/Zend/zend_compile.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/Zend/zend_globals_macros.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/Zend/zend_ptr_stack.h \ + /usr/include/php/20210902/Zend/zend_objects.h \ + /usr/include/php/20210902/Zend/zend_objects_API.h \ + /usr/include/php/20210902/Zend/zend_float.h \ + /usr/include/php/20210902/Zend/zend_multibyte.h \ + /usr/include/php/20210902/Zend/zend_arena.h \ + /usr/include/php/20210902/Zend/zend_vm_opcodes.h \ + /usr/include/php/20210902/Zend/zend_build.h \ + /usr/include/php/20210902/Zend/zend_list.h \ + /usr/include/php/20210902/Zend/zend_execute.h \ + /usr/include/php/20210902/Zend/zend_type_info.h \ + /usr/include/php/20210902/main/build-defs.h \ + /usr/include/php/20210902/main/php_stdint.h \ + /usr/include/php/20210902/Zend/zend_hash.h \ + /usr/include/php/20210902/Zend/zend_alloc.h \ + /usr/include/php/20210902/Zend/zend_stack.h \ + /usr/include/php/20210902/main/snprintf.h \ + /usr/include/php/20210902/main/spprintf.h \ + /usr/include/php/20210902/Zend/zend_smart_str_public.h \ + /usr/include/php/20210902/Zend/zend_smart_string_public.h \ + /usr/include/php/20210902/main/php_syslog.h \ + /usr/include/php/20210902/main/php.h \ + /usr/include/php/20210902/main/php_output.h \ + /usr/include/php/20210902/main/php_streams.h \ + /usr/include/php/20210902/Zend/zend_stream.h \ + /usr/include/php/20210902/main/streams/php_stream_context.h \ + /usr/include/php/20210902/main/streams/php_stream_filter_api.h \ + /usr/include/php/20210902/main/streams/php_stream_transport.h \ + /usr/include/php/20210902/main/streams/php_stream_plain_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_glob_wrapper.h \ + /usr/include/php/20210902/main/streams/php_stream_userspace.h \ + /usr/include/php/20210902/main/streams/php_stream_mmap.h \ + /usr/include/php/20210902/main/php_memory_streams.h \ + /usr/include/php/20210902/main/fopen_wrappers.h \ + /usr/include/php/20210902/main/php_globals.h \ + /usr/include/php/20210902/Zend/zend_globals.h \ + /usr/include/php/20210902/main/php_ini.h \ + /usr/include/php/20210902/Zend/zend_ini.h \ + /usr/include/php/20210902/Zend/zend_virtual_cwd.h \ + /usr/include/php/20210902/TSRM/TSRM.h \ + /usr/include/php/20210902/Zend/zend_constants.h \ + /usr/include/php/20210902/main/php_reentrancy.h \ + /usr/include/php/20210902/main/php_ini.h \ + /usr/include/php/20210902/ext/standard/php_standard.h \ + /usr/include/php/20210902/ext/standard/basic_functions.h \ + /usr/include/php/20210902/ext/standard/php_filestat.h \ + /usr/include/php/20210902/Zend/zend_highlight.h \ + /usr/include/php/20210902/ext/standard/url_scanner_ex.h \ + /usr/include/php/20210902/ext/standard/php_math.h \ + /usr/include/php/20210902/ext/standard/php_string.h \ + /usr/include/php/20210902/ext/standard/base64.h \ + /usr/include/php/20210902/ext/standard/php_dir.h \ + /usr/include/php/20210902/ext/standard/php_dns.h \ + /usr/include/php/20210902/ext/standard/php_mail.h \ + /usr/include/php/20210902/ext/standard/md5.h \ + /usr/include/php/20210902/ext/standard/basic_functions.h \ + /usr/include/php/20210902/ext/standard/sha1.h \ + /usr/include/php/20210902/ext/standard/hrtime.h \ + /usr/include/php/20210902/ext/standard/html.h \ + /usr/include/php/20210902/ext/standard/exec.h \ + /usr/include/php/20210902/ext/standard/file.h \ + /usr/include/php/20210902/main/php_network.h \ + /usr/include/php/20210902/ext/standard/php_ext_syslog.h \ + /usr/include/php/20210902/main/php_syslog.h \ + /usr/include/php/20210902/ext/standard/php_browscap.h \ + /usr/include/php/20210902/ext/standard/pack.h \ + /usr/include/php/20210902/ext/standard/datetime.h \ + /usr/include/php/20210902/ext/standard/url.h \ + /usr/include/php/20210902/ext/standard/pageinfo.h \ + /usr/include/php/20210902/ext/standard/fsock.h \ + /usr/include/php/20210902/ext/standard/php_image.h \ + /usr/include/php/20210902/ext/standard/info.h \ + /usr/include/php/20210902/ext/standard/php_var.h \ + /usr/include/php/20210902/ext/standard/quot_print.h \ + /usr/include/php/20210902/ext/standard/dl.h \ + /usr/include/php/20210902/ext/standard/php_crypt.h \ + /usr/include/php/20210902/ext/standard/head.h \ + /usr/include/php/20210902/ext/standard/php_lcg.h \ + /usr/include/php/20210902/main/php_output.h \ + /usr/include/php/20210902/ext/standard/php_array.h \ + /usr/include/php/20210902/ext/standard/php_assert.h \ + /usr/include/php/20210902/ext/standard/php_versioning.h \ + /usr/include/php/20210902/ext/standard/php_password.h \ + /usr/include/php/20210902/ext/standard/php_random.h \ + /usr/include/php/20210902/main/php_version.h \ + /usr/include/php/20210902/ext/standard/md5.h \ + /home/koeditzm/Entwicklung/php-firebird/php_interbase.h \ + /home/koeditzm/Entwicklung/php-firebird/php_ibase_includes.h \ + /opt/firebird/include/ibase.h \ + /opt/firebird/include/./firebird/impl/types_pub.h \ + /opt/firebird/include/./firebird/impl/dsc_pub.h \ + /opt/firebird/include/./firebird/impl/sqlda_pub.h \ + /opt/firebird/include/./firebird/impl/blr.h \ + /opt/firebird/include/./firebird/impl/consts_pub.h \ + /opt/firebird/include/./firebird/impl/inf_pub.h \ + /opt/firebird/include/./iberror.h \ + /opt/firebird/include/./firebird/impl/msg_helper.h \ + /opt/firebird/include/./firebird/impl/iberror_c.h \ + /usr/include/php/20210902/main/SAPI.h \ + /usr/include/php/20210902/Zend/zend_llist.h \ + /usr/include/php/20210902/Zend/zend_operators.h diff --git a/php_ibase_includes.h b/php_ibase_includes.h index dcbae6a..b55fee6 100644 --- a/php_ibase_includes.h +++ b/php_ibase_includes.h @@ -104,7 +104,7 @@ typedef struct event { ISC_LONG event_id; unsigned short event_count; char **events; - char *event_buffer, *result_buffer; + unsigned char *event_buffer, *result_buffer; zval callback; void *thread_ctx; struct event *event_next; diff --git a/php_interbase.h b/php_interbase.h index 679fc87..3f6d06b 100644 --- a/php_interbase.h +++ b/php_interbase.h @@ -32,7 +32,7 @@ extern zend_module_entry ibase_module_entry; #include "php_version.h" // Keep version in track with Firebird -#define PHP_INTERBASE_VERSION "3.0.1" +#define PHP_INTERBASE_VERSION "5.0.1" PHP_MINIT_FUNCTION(ibase); PHP_RINIT_FUNCTION(ibase); @@ -105,4 +105,4 @@ PHP_FUNCTION(ibase_free_event_handler); #define phpext_interbase_ptr NULL -#endif /* PHP_INTERBASE_H */ \ No newline at end of file +#endif /* PHP_INTERBASE_H */