fix shadowing of parameters

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index c226bc2f5f4e8bc3a1b2d7c9db58f68dda3fa2ee..90c8ab4bff1847824010d175510082c134ece0dc 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1235,12 +1235,12 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
                        fci.retval_ptr_ptr = &retval_ptr;
                        if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
                                if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
-                                       HashTable *ht = Z_ARRVAL_P(ctor_params);
+                                       HashTable *params_ht = Z_ARRVAL_P(ctor_params);
                                        Bucket *p;
 
                                        fci.param_count = 0;
-                                       fci.params = safe_emalloc(sizeof(zval*), ht->nNumOfElements, 0);
-                                       p = ht->pListHead;
+                                       fci.params = safe_emalloc(sizeof(zval*), params_ht->nNumOfElements, 0);
+                                       p = params_ht->pListHead;
                                        while (p != NULL) {
                                                fci.params[fci.param_count++] = (zval**)p->pData;
                                                p = p->pListNext;

diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h
index 271c5f69f2afb7ee5512acd6e76cb76762f7de19..7b8a41ce7d0662893a206cdbbcee18487c6940ad 100644 (file)
--- a/ext/mysqli/mysqli_priv.h
+++ b/ext/mysqli/mysqli_priv.h
@@ -79,10 +79,10 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
 #endif
 
 #define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \
-       zend_class_entry ce; \
-       INIT_CLASS_ENTRY(ce, name,class_functions); \
-       ce.create_object = mysqli_objects_new; \
-       mysqli_entry = zend_register_internal_class(&ce TSRMLS_CC); \
+       zend_class_entry tmp_ce; \
+       INIT_CLASS_ENTRY(tmp_ce, name,class_functions); \
+       tmp_ce.create_object = mysqli_objects_new; \
+       mysqli_entry = zend_register_internal_class(&tmp_ce TSRMLS_CC); \
 } \
 
 #define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type

diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c
index b95d6f00dfe02f869f2ae569cf67bafc6e4040ec..31aaae373af7cfb6881a81801486e5b4b800cd67 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps_codec.c
+++ b/ext/mysqlnd/mysqlnd_ps_codec.c
@@ -231,7 +231,7 @@ void ps_fetch_time(zval *zv, const MYSQLND_FIELD * const field,
 {
        struct st_mysqlnd_time t;
        unsigned int length; /* First byte encodes the length*/
-       char *to;
+       char * value;
        DBG_ENTER("ps_fetch_time");
 
        if ((length = php_mysqlnd_net_field_length(row))) {
@@ -262,17 +262,17 @@ void ps_fetch_time(zval *zv, const MYSQLND_FIELD * const field,
          QQ : How to make this unicode without copying two times the buffer -
          Unicode equivalent of spprintf?
        */
-       length = spprintf(&to, 0, "%s%02u:%02u:%02u", (t.neg ? "-" : ""), t.hour, t.minute, t.second);
+       length = spprintf(&value, 0, "%s%02u:%02u:%02u", (t.neg ? "-" : ""), t.hour, t.minute, t.second);
 
-       DBG_INF_FMT("%s", to);
+       DBG_INF_FMT("%s", value);
 #if MYSQLND_UNICODE
        if (!as_unicode) {
 #endif
-               ZVAL_STRINGL(zv, to, length, 1);
-               efree(to);  /* allocated by spprintf */
+               ZVAL_STRINGL(zv, value, length, 1);
+               efree(value);  /* allocated by spprintf */
 #if MYSQLND_UNICODE
        } else {
-               ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
+               ZVAL_UTF8_STRINGL(zv, value, length, ZSTR_AUTOFREE);
        }
 #endif
        DBG_VOID_RETURN;
@@ -288,7 +288,7 @@ void ps_fetch_date(zval *zv, const MYSQLND_FIELD * const field,
 {
        struct st_mysqlnd_time t = {0};
        unsigned int length; /* First byte encodes the length*/
-       char *to;
+       char * value;
        DBG_ENTER("ps_fetch_date");
 
        if ((length = php_mysqlnd_net_field_length(row))) {
@@ -313,17 +313,17 @@ void ps_fetch_date(zval *zv, const MYSQLND_FIELD * const field,
          QQ : How to make this unicode without copying two times the buffer -
          Unicode equivalent of spprintf?
        */
-       length = spprintf(&to, 0, "%04u-%02u-%02u", t.year, t.month, t.day);
+       length = spprintf(&value, 0, "%04u-%02u-%02u", t.year, t.month, t.day);
 
-       DBG_INF_FMT("%s", to);
+       DBG_INF_FMT("%s", value);
 #if MYSQLND_UNICODE
        if (!as_unicode) {
 #endif
-               ZVAL_STRINGL(zv, to, length, 1);
-               efree(to); /* allocated by spprintf */
+               ZVAL_STRINGL(zv, value, length, 1);
+               efree(value); /* allocated by spprintf */
 #if MYSQLND_UNICODE
        } else {
-               ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
+               ZVAL_UTF8_STRINGL(zv, value, length, ZSTR_AUTOFREE);
        }
 #endif
        DBG_VOID_RETURN;
@@ -339,7 +339,7 @@ void ps_fetch_datetime(zval *zv, const MYSQLND_FIELD * const field,
 {
        struct st_mysqlnd_time t;
        unsigned int length; /* First byte encodes the length*/
-       char *to;
+       char * value;
        DBG_ENTER("ps_fetch_datetime");
 
        if ((length = php_mysqlnd_net_field_length(row))) {
@@ -371,15 +371,15 @@ void ps_fetch_datetime(zval *zv, const MYSQLND_FIELD * const field,
          QQ : How to make this unicode without copying two times the buffer -
          Unicode equivalent of spprintf?
        */
-       length = spprintf(&to, 0, "%04u-%02u-%02u %02u:%02u:%02u",
+       length = spprintf(&value, 0, "%04u-%02u-%02u %02u:%02u:%02u",
                                          t.year, t.month, t.day, t.hour, t.minute, t.second);
 
-       DBG_INF_FMT("%s", to);
+       DBG_INF_FMT("%s", value);
 #if MYSQLND_UNICODE
        if (!as_unicode) {
 #endif
-               ZVAL_STRINGL(zv, to, length, 1);
-               efree(to); /* allocated by spprintf */
+               ZVAL_STRINGL(zv, value, length, 1);
+               efree(value); /* allocated by spprintf */
 #if MYSQLND_UNICODE
        } else {
                ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);