Cleaned up code to remove compiler warnings.

FirebirdSQL · Nov 20, 2024 · d59779b · d59779b
1 parent d7300db
commit d59779b
Show file tree

Hide file tree

Showing 9 changed files with 610 additions and 19 deletions.
diff --git a/ibase_blobs.dep 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
@@ -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,20 +117,20 @@ 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.
 	 * If the Firebird people ever fix this, these lines should be removed,
 	 * 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
@@ -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