Shut up, my lovely compiler; I do not like your warnings

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 2ba05399b4ddb67d70c7d26bb5d8810460b5e8d7..c7adf38f3b783b6cad4a9dfe851398cde810b8ce 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -169,6 +169,8 @@ ZEND_API HashTable *zend_std_get_debug_info(zval *object, int *is_temp TSRMLS_DC
        }
 
        zend_error_noreturn(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
+
+       return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */
 }
 /* }}} */
 

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 53cf205f5eed68587b47af9be36c0073a2b39a1c..1620c0562109c7a24b37edc18f5f7fe49fbf59f1 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -779,7 +779,7 @@ static ZEND_FUNCTION(opcache_compile_file)
                op_array = persistent_compile_file(&handle, ZEND_INCLUDE TSRMLS_CC);
        } zend_catch {
                EG(current_execute_data) = orig_execute_data;
-               zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " could not compile file %s" TSRMLS_CC, handle.filename);
+               zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " could not compile file %s", handle.filename);
        } zend_end_try();
 
        if(op_array != NULL) {

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 897b1a9e49427bc898491bf1be1c92078effd98f..be1a7062a1b45c21067225c75a9c2c468354f020 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -957,11 +957,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_scandir, 0, 0, 1)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 /* }}} */
-/* {{{ arginfo ext/standard/dl.c */
-ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
-       ZEND_ARG_INFO(0, extension_filename)
-ZEND_END_ARG_INFO()
-/* }}} */
 /* {{{ dns.c */
 ZEND_BEGIN_ARG_INFO(arginfo_gethostbyaddr, 0)
        ZEND_ARG_INFO(0, ip_address)

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index d2b3a327ff9ef4480331f34f260c0daeb739c68e..cbf79a7fc1878f17b8714c9deb907628ff965de2 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -276,12 +276,12 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC)
                if (!val) {
                        val = "";
                }
-               if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), &new_val_len TSRMLS_CC)) {
+               if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), (unsigned int *)&new_val_len TSRMLS_CC)) {
                        php_register_variable_safe(key, val, new_val_len, track_vars_array TSRMLS_CC);
                }
        APR_ARRAY_FOREACH_CLOSE()
 
-       if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), &new_val_len TSRMLS_CC)) {
+       if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), (unsigned int *)&new_val_len TSRMLS_CC)) {
                php_register_variable_safe("PHP_SELF", ctx->r->uri, new_val_len, track_vars_array TSRMLS_CC);
        }
 }

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index f464e1e92a0ab51fcb66078e214dd61d53542c23..437d09cf32ff499ca69853523912fa7bc017647c 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1824,7 +1824,7 @@ int main(int argc, char *argv[])
                unsigned char *p;
                decoded_query_string = strdup(query_string);
                php_url_decode(decoded_query_string, strlen(decoded_query_string));
-               for (p = decoded_query_string; *p &&  *p <= ' '; p++) {
+               for (p = (unsigned char *)decoded_query_string; *p &&  *p <= ' '; p++) {
                        /* skip all leading spaces */
                }
                if(*p == '-') {