Skip to content

Commit fc444fb

Browse files
bwoebilaruence
authored andcommitted
Shut up, my lovely compiler; I do not like your warnings
Conflicts: Zend/zend_object_handlers.c
1 parent c892127 commit fc444fb

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

ext/opcache/zend_accelerator_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ static ZEND_FUNCTION(opcache_compile_file)
775775
op_array = persistent_compile_file(&handle, ZEND_INCLUDE TSRMLS_CC);
776776
} zend_catch {
777777
EG(current_execute_data) = orig_execute_data;
778-
zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " could not compile file %s" TSRMLS_CC, handle.filename);
778+
zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " could not compile file %s", handle.filename);
779779
} zend_end_try();
780780

781781
if(op_array != NULL) {

ext/standard/basic_functions.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -976,11 +976,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_scandir, 0, 0, 1)
976976
ZEND_ARG_INFO(0, context)
977977
ZEND_END_ARG_INFO()
978978
/* }}} */
979-
/* {{{ arginfo ext/standard/dl.c */
980-
ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
981-
ZEND_ARG_INFO(0, extension_filename)
982-
ZEND_END_ARG_INFO()
983-
/* }}} */
984979
/* {{{ dns.c */
985980
ZEND_BEGIN_ARG_INFO(arginfo_gethostbyaddr, 0)
986981
ZEND_ARG_INFO(0, ip_address)

sapi/apache2handler/sapi_apache2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,12 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC)
276276
if (!val) {
277277
val = "";
278278
}
279-
if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), &new_val_len TSRMLS_CC)) {
279+
if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), (unsigned int *)&new_val_len TSRMLS_CC)) {
280280
php_register_variable_safe(key, val, new_val_len, track_vars_array TSRMLS_CC);
281281
}
282282
APR_ARRAY_FOREACH_CLOSE()
283283

284-
if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), &new_val_len TSRMLS_CC)) {
284+
if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), (unsigned int *)&new_val_len TSRMLS_CC)) {
285285
php_register_variable_safe("PHP_SELF", ctx->r->uri, new_val_len, track_vars_array TSRMLS_CC);
286286
}
287287
}

sapi/cgi/cgi_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1826,7 +1826,7 @@ int main(int argc, char *argv[])
18261826
unsigned char *p;
18271827
decoded_query_string = strdup(query_string);
18281828
php_url_decode(decoded_query_string, strlen(decoded_query_string));
1829-
for (p = decoded_query_string; *p && *p <= ' '; p++) {
1829+
for (p = (unsigned char *)decoded_query_string; *p && *p <= ' '; p++) {
18301830
/* skip all leading spaces */
18311831
}
18321832
if(*p == '-') {

0 commit comments

Comments
 (0)