Skip to content

Commit d59779b

Browse files
author
Martin Köditz
committed
Cleaned up code to remove compiler warnings.
1 parent d7300db commit d59779b

9 files changed

+610
-19
lines changed

‎ibase_blobs.dep

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
ibase_blobs.lo: /home/koeditzm/Entwicklung/php-firebird/ibase_blobs.c \
2+
/home/koeditzm/Entwicklung/php-firebird/config.h \
3+
/usr/include/php/20210902/main/php.h \
4+
/usr/include/php/20210902/main/php_config.h \
5+
/usr/include/php/20210902/main/php_version.h \
6+
/usr/include/php/20210902/Zend/zend.h \
7+
/usr/include/php/20210902/Zend/zend_types.h \
8+
/usr/include/php/20210902/Zend/zend_portability.h \
9+
/usr/include/php/20210902/Zend/zend_config.h \
10+
/usr/include/php/20210902/main/../main/php_config.h \
11+
/usr/include/php/20210902/Zend/../TSRM/TSRM.h \
12+
/usr/include/php/20210902/main/php_config.h \
13+
/usr/include/php/20210902/main/php_stdint.h \
14+
/usr/include/php/20210902/Zend/zend_range_check.h \
15+
/usr/include/php/20210902/Zend/zend_long.h \
16+
/usr/include/php/20210902/Zend/zend_map_ptr.h \
17+
/usr/include/php/20210902/Zend/zend_errors.h \
18+
/usr/include/php/20210902/Zend/zend_alloc.h \
19+
/usr/include/php/20210902/Zend/zend.h \
20+
/usr/include/php/20210902/Zend/zend_alloc_sizes.h \
21+
/usr/include/php/20210902/Zend/zend_llist.h \
22+
/usr/include/php/20210902/Zend/zend_string.h \
23+
/usr/include/php/20210902/Zend/zend_hash.h \
24+
/usr/include/php/20210902/Zend/zend_ast.h \
25+
/usr/include/php/20210902/Zend/zend_gc.h \
26+
/usr/include/php/20210902/Zend/zend_variables.h \
27+
/usr/include/php/20210902/Zend/zend_iterators.h \
28+
/usr/include/php/20210902/Zend/zend_stream.h \
29+
/usr/include/php/20210902/Zend/zend_smart_str_public.h \
30+
/usr/include/php/20210902/Zend/zend_smart_string_public.h \
31+
/usr/include/php/20210902/Zend/zend_signal.h \
32+
/usr/include/php/20210902/Zend/zend_max_execution_timer.h \
33+
/usr/include/php/20210902/Zend/zend_object_handlers.h \
34+
/usr/include/php/20210902/Zend/zend_operators.h \
35+
/usr/include/php/20210902/Zend/zend_strtod.h \
36+
/usr/include/php/20210902/Zend/zend_multiply.h \
37+
/usr/include/php/20210902/Zend/zend_sort.h \
38+
/usr/include/php/20210902/main/php_compat.h \
39+
/usr/include/php/20210902/main/php_config.h \
40+
/usr/include/php/20210902/Zend/zend_API.h \
41+
/usr/include/php/20210902/Zend/zend_modules.h \
42+
/usr/include/php/20210902/Zend/zend_compile.h \
43+
/usr/include/php/20210902/Zend/zend_globals.h \
44+
/usr/include/php/20210902/Zend/zend_globals_macros.h \
45+
/usr/include/php/20210902/Zend/zend_stack.h \
46+
/usr/include/php/20210902/Zend/zend_ptr_stack.h \
47+
/usr/include/php/20210902/Zend/zend_objects.h \
48+
/usr/include/php/20210902/Zend/zend_objects_API.h \
49+
/usr/include/php/20210902/Zend/zend_float.h \
50+
/usr/include/php/20210902/Zend/zend_multibyte.h \
51+
/usr/include/php/20210902/Zend/zend_arena.h \
52+
/usr/include/php/20210902/Zend/zend_vm_opcodes.h \
53+
/usr/include/php/20210902/Zend/zend_build.h \
54+
/usr/include/php/20210902/Zend/zend_list.h \
55+
/usr/include/php/20210902/Zend/zend_execute.h \
56+
/usr/include/php/20210902/Zend/zend_type_info.h \
57+
/usr/include/php/20210902/main/build-defs.h \
58+
/usr/include/php/20210902/main/php_stdint.h \
59+
/usr/include/php/20210902/Zend/zend_hash.h \
60+
/usr/include/php/20210902/Zend/zend_alloc.h \
61+
/usr/include/php/20210902/Zend/zend_stack.h \
62+
/usr/include/php/20210902/main/snprintf.h \
63+
/usr/include/php/20210902/main/spprintf.h \
64+
/usr/include/php/20210902/Zend/zend_smart_str_public.h \
65+
/usr/include/php/20210902/Zend/zend_smart_string_public.h \
66+
/usr/include/php/20210902/main/php_syslog.h \
67+
/usr/include/php/20210902/main/php.h \
68+
/usr/include/php/20210902/main/php_output.h \
69+
/usr/include/php/20210902/main/php_streams.h \
70+
/usr/include/php/20210902/Zend/zend_stream.h \
71+
/usr/include/php/20210902/main/streams/php_stream_context.h \
72+
/usr/include/php/20210902/main/streams/php_stream_filter_api.h \
73+
/usr/include/php/20210902/main/streams/php_stream_transport.h \
74+
/usr/include/php/20210902/main/streams/php_stream_plain_wrapper.h \
75+
/usr/include/php/20210902/main/streams/php_stream_glob_wrapper.h \
76+
/usr/include/php/20210902/main/streams/php_stream_userspace.h \
77+
/usr/include/php/20210902/main/streams/php_stream_mmap.h \
78+
/usr/include/php/20210902/main/php_memory_streams.h \
79+
/usr/include/php/20210902/main/fopen_wrappers.h \
80+
/usr/include/php/20210902/main/php_globals.h \
81+
/usr/include/php/20210902/Zend/zend_globals.h \
82+
/usr/include/php/20210902/main/php_ini.h \
83+
/usr/include/php/20210902/Zend/zend_ini.h \
84+
/usr/include/php/20210902/Zend/zend_virtual_cwd.h \
85+
/usr/include/php/20210902/TSRM/TSRM.h \
86+
/usr/include/php/20210902/Zend/zend_constants.h \
87+
/usr/include/php/20210902/main/php_reentrancy.h \
88+
/home/koeditzm/Entwicklung/php-firebird/php_interbase.h \
89+
/usr/include/php/20210902/main/php_version.h \
90+
/home/koeditzm/Entwicklung/php-firebird/php_ibase_includes.h \
91+
/opt/firebird/include/ibase.h \
92+
/opt/firebird/include/./firebird/impl/types_pub.h \
93+
/opt/firebird/include/./firebird/impl/dsc_pub.h \
94+
/opt/firebird/include/./firebird/impl/sqlda_pub.h \
95+
/opt/firebird/include/./firebird/impl/blr.h \
96+
/opt/firebird/include/./firebird/impl/consts_pub.h \
97+
/opt/firebird/include/./firebird/impl/inf_pub.h \
98+
/opt/firebird/include/./iberror.h \
99+
/opt/firebird/include/./firebird/impl/msg_helper.h \
100+
/opt/firebird/include/./firebird/impl/iberror_c.h

‎ibase_events.c

+15-15
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
static int le_event;
4444

45-
static void _php_ibase_event_free(char *event_buf, char *result_buf) /* {{{ */
45+
static void _php_ibase_event_free(unsigned char *event_buf, unsigned char *result_buf) /* {{{ */
4646
{
4747
isc_free(event_buf);
4848
isc_free(result_buf);
@@ -90,7 +90,6 @@ static void _php_ibase_free_event_rsrc(zend_resource *rsrc) /* {{{ */
9090
ibase_event *e = (ibase_event *) rsrc->ptr;
9191

9292
_php_ibase_free_event(e);
93-
9493
efree(e);
9594
}
9695
/* }}} */
@@ -102,13 +101,13 @@ void php_ibase_events_minit(INIT_FUNC_ARGS) /* {{{ */
102101
}
103102
/* }}} */
104103

105-
static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count, /* {{{ */
106-
char **events, unsigned short *l, char **event_buf, char **result_buf)
104+
static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count,
105+
char **events, unsigned short *l, unsigned char **event_buf, unsigned char **result_buf)
107106
{
108-
ISC_STATUS dummy_result[20];
109-
ISC_ULONG dummy_count[15];
107+
ISC_STATUS dummy_result[20];
108+
ISC_ULONG dummy_count[15];
110109

111-
/**
110+
/**
112111
* Unfortunately, there's no clean and portable way in C to pass arguments to
113112
* a variadic function if you don't know the number of arguments at compile time.
114113
* (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,
118117
* so we can work around it.
119118
*/
120119

121-
*l = (unsigned short) isc_event_block(event_buf, result_buf, count, events[0],
122-
events[1], events[2], events[3], events[4], events[5], events[6], events[7],
123-
events[8], events[9], events[10], events[11], events[12], events[13], events[14]);
120+
*l = (unsigned short) isc_event_block(event_buf, result_buf, count, events[0],
121+
events[1], events[2], events[3], events[4], events[5], events[6], events[7],
122+
events[8], events[9], events[10], events[11], events[12], events[13], events[14]);
124123

125-
/**
124+
/**
126125
* Currently, this is the only way to correctly initialize an event buffer.
127126
* This is clearly something that should be fixed, cause the semantics of
128127
* isc_wait_for_event() indicate that it blocks until an event occurs.
129128
* If the Firebird people ever fix this, these lines should be removed,
130129
* otherwise, events will have to fire twice before ibase_wait_event() returns.
131130
*/
132131

133-
isc_wait_for_event(dummy_result, &ib_link->handle, *l, *event_buf, *result_buf);
134-
isc_event_counts(dummy_count, *l, *event_buf, *result_buf);
132+
isc_wait_for_event(dummy_result, &ib_link->handle, *l, *event_buf, *result_buf);
133+
isc_event_counts(dummy_count, *l, *event_buf, *result_buf);
135134
}
136135
/* }}} */
137136

@@ -142,7 +141,8 @@ PHP_FUNCTION(ibase_wait_event)
142141
zval *args;
143142
ibase_db_link *ib_link;
144143
int num_args;
145-
char *event_buffer, *result_buffer, *events[15];
144+
unsigned char *event_buffer, *result_buffer;
145+
char *events[15];
146146
unsigned short i = 0, event_count = 0, buffer_size;
147147
ISC_ULONG occurred_event[15];
148148

@@ -210,7 +210,7 @@ static ISC_EVENT_CALLBACK _php_ibase_callback(ibase_event *event, /* {{{ */
210210
#else
211211
#define PHP_ISC_CALLBACK isc_callback
212212
static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
213-
unsigned short buffer_size, char *result_buf)
213+
unsigned short buffer_size, unsigned char *result_buf)
214214
#endif
215215
{
216216
/* this function is called asynchronously by the Interbase client library. */

‎ibase_events.dep

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
ibase_events.lo: /home/koeditzm/Entwicklung/php-firebird/ibase_events.c \
2+
/home/koeditzm/Entwicklung/php-firebird/config.h \
3+
/usr/include/php/20210902/main/php.h \
4+
/usr/include/php/20210902/main/php_config.h \
5+
/usr/include/php/20210902/main/php_version.h \
6+
/usr/include/php/20210902/Zend/zend.h \
7+
/usr/include/php/20210902/Zend/zend_types.h \
8+
/usr/include/php/20210902/Zend/zend_portability.h \
9+
/usr/include/php/20210902/Zend/zend_config.h \
10+
/usr/include/php/20210902/main/../main/php_config.h \
11+
/usr/include/php/20210902/Zend/../TSRM/TSRM.h \
12+
/usr/include/php/20210902/main/php_config.h \
13+
/usr/include/php/20210902/main/php_stdint.h \
14+
/usr/include/php/20210902/Zend/zend_range_check.h \
15+
/usr/include/php/20210902/Zend/zend_long.h \
16+
/usr/include/php/20210902/Zend/zend_map_ptr.h \
17+
/usr/include/php/20210902/Zend/zend_errors.h \
18+
/usr/include/php/20210902/Zend/zend_alloc.h \
19+
/usr/include/php/20210902/Zend/zend.h \
20+
/usr/include/php/20210902/Zend/zend_alloc_sizes.h \
21+
/usr/include/php/20210902/Zend/zend_llist.h \
22+
/usr/include/php/20210902/Zend/zend_string.h \
23+
/usr/include/php/20210902/Zend/zend_hash.h \
24+
/usr/include/php/20210902/Zend/zend_ast.h \
25+
/usr/include/php/20210902/Zend/zend_gc.h \
26+
/usr/include/php/20210902/Zend/zend_variables.h \
27+
/usr/include/php/20210902/Zend/zend_iterators.h \
28+
/usr/include/php/20210902/Zend/zend_stream.h \
29+
/usr/include/php/20210902/Zend/zend_smart_str_public.h \
30+
/usr/include/php/20210902/Zend/zend_smart_string_public.h \
31+
/usr/include/php/20210902/Zend/zend_signal.h \
32+
/usr/include/php/20210902/Zend/zend_max_execution_timer.h \
33+
/usr/include/php/20210902/Zend/zend_object_handlers.h \
34+
/usr/include/php/20210902/Zend/zend_operators.h \
35+
/usr/include/php/20210902/Zend/zend_strtod.h \
36+
/usr/include/php/20210902/Zend/zend_multiply.h \
37+
/usr/include/php/20210902/Zend/zend_sort.h \
38+
/usr/include/php/20210902/main/php_compat.h \
39+
/usr/include/php/20210902/main/php_config.h \
40+
/usr/include/php/20210902/Zend/zend_API.h \
41+
/usr/include/php/20210902/Zend/zend_modules.h \
42+
/usr/include/php/20210902/Zend/zend_compile.h \
43+
/usr/include/php/20210902/Zend/zend_globals.h \
44+
/usr/include/php/20210902/Zend/zend_globals_macros.h \
45+
/usr/include/php/20210902/Zend/zend_stack.h \
46+
/usr/include/php/20210902/Zend/zend_ptr_stack.h \
47+
/usr/include/php/20210902/Zend/zend_objects.h \
48+
/usr/include/php/20210902/Zend/zend_objects_API.h \
49+
/usr/include/php/20210902/Zend/zend_float.h \
50+
/usr/include/php/20210902/Zend/zend_multibyte.h \
51+
/usr/include/php/20210902/Zend/zend_arena.h \
52+
/usr/include/php/20210902/Zend/zend_vm_opcodes.h \
53+
/usr/include/php/20210902/Zend/zend_build.h \
54+
/usr/include/php/20210902/Zend/zend_list.h \
55+
/usr/include/php/20210902/Zend/zend_execute.h \
56+
/usr/include/php/20210902/Zend/zend_type_info.h \
57+
/usr/include/php/20210902/main/build-defs.h \
58+
/usr/include/php/20210902/main/php_stdint.h \
59+
/usr/include/php/20210902/Zend/zend_hash.h \
60+
/usr/include/php/20210902/Zend/zend_alloc.h \
61+
/usr/include/php/20210902/Zend/zend_stack.h \
62+
/usr/include/php/20210902/main/snprintf.h \
63+
/usr/include/php/20210902/main/spprintf.h \
64+
/usr/include/php/20210902/Zend/zend_smart_str_public.h \
65+
/usr/include/php/20210902/Zend/zend_smart_string_public.h \
66+
/usr/include/php/20210902/main/php_syslog.h \
67+
/usr/include/php/20210902/main/php.h \
68+
/usr/include/php/20210902/main/php_output.h \
69+
/usr/include/php/20210902/main/php_streams.h \
70+
/usr/include/php/20210902/Zend/zend_stream.h \
71+
/usr/include/php/20210902/main/streams/php_stream_context.h \
72+
/usr/include/php/20210902/main/streams/php_stream_filter_api.h \
73+
/usr/include/php/20210902/main/streams/php_stream_transport.h \
74+
/usr/include/php/20210902/main/streams/php_stream_plain_wrapper.h \
75+
/usr/include/php/20210902/main/streams/php_stream_glob_wrapper.h \
76+
/usr/include/php/20210902/main/streams/php_stream_userspace.h \
77+
/usr/include/php/20210902/main/streams/php_stream_mmap.h \
78+
/usr/include/php/20210902/main/php_memory_streams.h \
79+
/usr/include/php/20210902/main/fopen_wrappers.h \
80+
/usr/include/php/20210902/main/php_globals.h \
81+
/usr/include/php/20210902/Zend/zend_globals.h \
82+
/usr/include/php/20210902/main/php_ini.h \
83+
/usr/include/php/20210902/Zend/zend_ini.h \
84+
/usr/include/php/20210902/Zend/zend_virtual_cwd.h \
85+
/usr/include/php/20210902/TSRM/TSRM.h \
86+
/usr/include/php/20210902/Zend/zend_constants.h \
87+
/usr/include/php/20210902/main/php_reentrancy.h \
88+
/home/koeditzm/Entwicklung/php-firebird/php_interbase.h \
89+
/usr/include/php/20210902/main/php_version.h \
90+
/home/koeditzm/Entwicklung/php-firebird/php_ibase_includes.h \
91+
/opt/firebird/include/ibase.h \
92+
/opt/firebird/include/./firebird/impl/types_pub.h \
93+
/opt/firebird/include/./firebird/impl/dsc_pub.h \
94+
/opt/firebird/include/./firebird/impl/sqlda_pub.h \
95+
/opt/firebird/include/./firebird/impl/blr.h \
96+
/opt/firebird/include/./firebird/impl/consts_pub.h \
97+
/opt/firebird/include/./firebird/impl/inf_pub.h \
98+
/opt/firebird/include/./iberror.h \
99+
/opt/firebird/include/./firebird/impl/msg_helper.h \
100+
/opt/firebird/include/./firebird/impl/iberror_c.h

0 commit comments

Comments
 (0)