fix some uninitialized variables. also fix shadowing of global symbols

diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index 31d0874048a7cfdc01719a2986be201d71ad4110..0c5c5153b66edcd65c97d3c10ab04da0dc944569 100644 (file)
--- a/ext/mysqlnd/mysqlnd_debug.c
+++ b/ext/mysqlnd/mysqlnd_debug.c
@@ -1593,14 +1593,14 @@ static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list
                case IS_OBJECT: {
                        char *class_name;
                        zend_uint class_name_len;
-                       int dup;
+                       int dupl;
 
                        TRACE_APPEND_STR("Object(");
 
-                       dup = zend_get_object_classname(*arg, &class_name, &class_name_len TSRMLS_CC);
+                       dupl = zend_get_object_classname(*arg, &class_name, &class_name_len TSRMLS_CC);
 
                        TRACE_APPEND_STRL(class_name, class_name_len);
-                       if(!dup) {
+                       if (!dupl) {
                                efree(class_name);
                        }
 

diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c
index 516886d2d4968201c83f431e127bc26aa86849b0..4623898248f6e40808f234cb5ab5427eb099a0eb 100644 (file)
--- a/ext/mysqlnd/mysqlnd_loaddata.c
+++ b/ext/mysqlnd/mysqlnd_loaddata.c
@@ -173,7 +173,7 @@ static const char *lost_conn = "Lost connection to MySQL server during LOAD DATA
 enum_func_status
 mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_warning TSRMLS_DC)
 {
-       char                            *buf;
+       char                            *buf = NULL;
        char                            empty_packet[MYSQLND_HEADER_SIZE];
        enum_func_status        result = FAIL;
        unsigned int            buflen = 4096;
@@ -244,7 +244,9 @@ infile_error:
        }
 
        (*conn->infile.local_infile_end)(info TSRMLS_CC);
-       mnd_efree(buf);
+       if (buf) {
+               mnd_efree(buf);
+       }
        DBG_INF_FMT("%s", result == PASS? "PASS":"FAIL");
        DBG_RETURN(result);
 }

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index cecce5ec439181e0f2a0c79703703e0be37d94fb..cedf7507111ed75bcfd49ed4d6c2d00787a95210 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -2125,7 +2125,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close)(MYSQLND_STMT * const s, zend_boo
        MYSQLND_STMT_DATA * stmt = s? s->data:NULL;
        MYSQLND * conn;
        zend_uchar cmd_buf[STMT_ID_LENGTH /* statement id */];
-       enum_mysqlnd_collected_stats stat = STAT_LAST;
+       enum_mysqlnd_collected_stats statistic = STAT_LAST;
 
        DBG_ENTER("mysqlnd_stmt::net_close");
        if (!stmt || !stmt->conn) {
@@ -2176,16 +2176,16 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close)(MYSQLND_STMT * const s, zend_boo
        }
        switch (stmt->execute_count) {
                case 0:
-                       stat = STAT_PS_PREPARED_NEVER_EXECUTED;
+                       statistic = STAT_PS_PREPARED_NEVER_EXECUTED;
                        break;
                case 1:
-                       stat = STAT_PS_PREPARED_ONCE_USED;
+                       statistic = STAT_PS_PREPARED_ONCE_USED;
                        break;
                default:
                        break;
        }
-       if (stat != STAT_LAST) {
-               MYSQLND_INC_CONN_STATISTIC(conn->stats, stat);
+       if (statistic != STAT_LAST) {
+               MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);
        }
 
        if (stmt->execute_cmd_buffer.buffer) {
@@ -2209,7 +2209,7 @@ static enum_func_status
 MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit TSRMLS_DC)
 {
        MYSQLND_STMT_DATA * stmt = s? s->data:NULL;
-       enum_func_status ret;
+       enum_func_status ret = FAIL;
        zend_bool persistent = s->persistent;
 
        DBG_ENTER("mysqlnd_stmt::dtor");

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 8c470ee19a42bd6473b22a9b1c5df69270009028..325aba5f9daae6560ad861d255b450b50b3263d4 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -459,7 +459,7 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT * s TSRMLS_DC)
                                break;
                        default: do {                   /* Result set */
                                MYSQLND_RES * result;
-                               enum_mysqlnd_collected_stats stat = STAT_LAST;
+                               enum_mysqlnd_collected_stats statistic = STAT_LAST;
 
                                DBG_INF("Result set pending");
                                SET_EMPTY_MESSAGE(conn->last_message, conn->last_message_len, conn->persistent);
@@ -548,11 +548,11 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT * s TSRMLS_DC)
                                        */
                                        conn->upsert_status.server_status = fields_eof->server_status;
                                        if (fields_eof->server_status & SERVER_QUERY_NO_GOOD_INDEX_USED) {
-                                               stat = STAT_BAD_INDEX_USED;
+                                               statistic = STAT_BAD_INDEX_USED;
                                        } else if (fields_eof->server_status & SERVER_QUERY_NO_INDEX_USED) {
-                                               stat = STAT_NO_INDEX_USED;
+                                               statistic = STAT_NO_INDEX_USED;
                                        } else if (fields_eof->server_status & SERVER_QUERY_WAS_SLOW) {
-                                               stat = STAT_QUERY_WAS_SLOW;
+                                               statistic = STAT_QUERY_WAS_SLOW;
                                        }
                                        if (to_log) {
 #if A0
@@ -561,7 +561,7 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT * s TSRMLS_DC)
                                                efree(backtrace);
 #endif
                                        }
-                                       MYSQLND_INC_CONN_STATISTIC(conn->stats, stat);
+                                       MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);
                                }
                        } while (0);
                        PACKET_FREE(fields_eof);
@@ -1610,7 +1610,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, unsigned int flags,
        }
 
        /* 4 is a magic value. The cast is safe, if larger then the array will be later extended - no big deal :) */
-       mysqlnd_array_init(return_value, (unsigned int) set? (uint) set->row_count : 4); 
+       mysqlnd_array_init(return_value, set? (unsigned int) set->row_count : 4); 
 
        do {
                MAKE_STD_ZVAL(row);

diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c
index 5d6b9711e202eca3bb6c9e1e489f42df34f3234e..8d4d73603f9d33518be456a13f17d6eedca61580 100644 (file)
--- a/ext/mysqlnd/mysqlnd_statistics.c
+++ b/ext/mysqlnd/mysqlnd_statistics.c
@@ -274,14 +274,14 @@ mysqlnd_stats_end(MYSQLND_STATS * stats)
 
 /* {{{ mysqlnd_stats_set_trigger */
 PHPAPI mysqlnd_stat_trigger
-mysqlnd_stats_set_trigger(MYSQLND_STATS * const stats, enum_mysqlnd_collected_stats stat, mysqlnd_stat_trigger trigger TSRMLS_DC)
+mysqlnd_stats_set_trigger(MYSQLND_STATS * const stats, enum_mysqlnd_collected_stats statistic, mysqlnd_stat_trigger trigger TSRMLS_DC)
 {
        mysqlnd_stat_trigger ret = NULL;
        DBG_ENTER("mysqlnd_stats_set_trigger");
        if (stats) {
                MYSQLND_STATS_LOCK(stats);
-               ret = stats->triggers[stat];
-               stats->triggers[stat] = trigger;
+               ret = stats->triggers[statistic];
+               stats->triggers[statistic] = trigger;
                MYSQLND_STATS_UNLOCK(stats);
        }
        DBG_RETURN(ret);