From: Christopher Jones <sixd@php.net>
Date: Thu, 15 Aug 2013 03:47:00 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c166c47584c7a7eb8c1ce42ea05a8a5677da028;p=php

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
---

3c166c47584c7a7eb8c1ce42ea05a8a5677da028
diff --cc ext/gmp/gmp.c
index 6b3dadf405,e3a3563aac..8b5c131e76
--- 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;
  	}