Re: com php-src: Shut up, my lovely compiler; I do not like your warnings: Zend/zend_object_handlers.c ext/opcache/zend_accelerator_module.c
ext/standard/basic_functions.c sapi/apache2handler/sapi_apache2.c sapi/cgi/cgi_main.c
| From: | Peter Cowburn | Date: | Fri, 11 Apr 2014 19:54:03 +0000 |
| Subject: | Re: com php-src: Shut up, my lovely compiler; I do not like your warnings: Zend/zend_object_handlers.c ext/opcache/zend_accelerator_module.c ext/standard/basic_functions.c sapi/apache2handler/sapi_apache2.c sapi/cgi/cgi_main.c |
||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-76797@lists.php.net to get a copy of this message | ||
On 11 April 2014 18:33, Bob Weinand <bwoebi@php.net> wrote:
> Commit: 99d1a1bb3f96364d1ee7bf3e9c84215001200112
> Author: Bob Weinand <bobwei9@hotmail.com> Fri, 11 Apr 2014
> 19:33:56 +0200
> Parents: 35b895fdf0fd2b4fe9ba0e9e7edc513a0a39e205
> Branches: PHP-5.6
>
> Link:
> ‹³–
> ¶¿A¬ãvA,òÌ7http://git.php.net/?p=php-src.git;a=commitdiff;h=99d1a1bb3f96364d1ee7bf3e9c84215001200112
>
> Log:
> Shut up, my lovely compiler; I do not like your warnings
>
> Changed paths:
> M Zend/zend_object_handlers.c
> M ext/opcache/zend_accelerator_module.c
> M ext/standard/basic_functions.c
> M sapi/apache2handler/sapi_apache2.c
> M sapi/cgi/cgi_main.c
>
>
> Diff:
> diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
> index 2ba0539..c7adf38 100644
> --- 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... */
>
Seriously, why add the comment?...
> }
> /* }}} */
>
> diff --git a/ext/opcache/zend_accelerator_module.c
> b/ext/opcache/zend_accelerator_module.c
> index 53cf205..1620c05 100644
> --- 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 897b1a9..be1a706 100644
> --- 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 d2b3a32..cbf79a7 100644
> --- 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 f464e1e..437d09c 100644
> --- 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 == '-') {
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>