Merge branch 'PHP-5.4' into PHP-5.5

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

Conflicts:
	ext/dba/libinifile/inifile.c
This commit is contained in:
Christopher Jones 2013-08-14 20:43:25 -07:00
commit 39612afc72
21 changed files with 30 additions and 31 deletions

View file

@ -55,7 +55,7 @@ PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zva
PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars_array TSRMLS_DC)
{
char *p = NULL;
char *ip; /* index pointer */
char *ip = NULL; /* index pointer */
char *index;
char *var, *var_orig;
int var_len, index_len;