Commit:    3c166c47584c7a7eb8c1ce42ea05a8a5677da028
Author:    Christopher Jones <s...@php.net>         Wed, 14 Aug 2013 20:47:00 
-0700
Parents:   759517651ec5fb09349a3653435dc9ddd0fc53b5 
39612afc72623e89a2bc595c9be4be497568d1be
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=3c166c47584c7a7eb8c1ce42ea05a8a5677da028

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.

Conflicts:
        ext/gmp/gmp.c

Changed paths:
  MM  ext/gmp/gmp.c
  MM  ext/openssl/openssl.c
  MM  ext/openssl/xp_ssl.c
  MM  ext/session/session.c
  MM  ext/standard/string.c
  MM  ext/zip/php_zip.c
  MM  main/rfc1867.c


Diff:
diff --cc ext/gmp/gmp.c
index 6b3dadf,e3a3563..8b5c131
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@@ -1360,12 -1066,12 +1360,12 @@@ ZEND_FUNCTION(gmp_pow
     Raise base to power exp and take result modulo mod */
  ZEND_FUNCTION(gmp_powm)
  {
 -      zval **base_arg, **exp_arg, **mod_arg;
 -      mpz_t *gmpnum_base, *gmpnum_exp, *gmpnum_mod, *gmpnum_result;
 +      zval *base_arg, *exp_arg, *mod_arg;
 +      mpz_ptr gmpnum_base, gmpnum_exp, gmpnum_mod, gmpnum_result;
        int use_ui = 0;
-       gmp_temp_t temp_base, temp_exp, temp_mod;
 -      int temp_base = 0, temp_exp = 0, temp_mod;
++      gmp_temp_t temp_base = {0}, temp_exp = {0}, temp_mod;
  
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZZ", &base_arg, 
&exp_arg, &mod_arg) == FAILURE){
 +      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zzz", &base_arg, 
&exp_arg, &mod_arg) == FAILURE){
                return;
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to