Fix compiler warnings

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index bec30cd006c04c233a7f68c6f6c4f27338dc3ab7..d8e183edf5a14c9505301b0fadaa6611bfaa1884 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -585,7 +585,7 @@ ZEND_METHOD(exception, getTraceAsString)
 {
        zval *trace, *frame;
        zend_ulong index;
-       zend_string *str, *key;
+       zend_string *str;
        int num = 0, len;
        char s_tmp[MAX_LENGTH_OF_LONG + 7 + 1 + 1];
 
@@ -594,7 +594,7 @@ ZEND_METHOD(exception, getTraceAsString)
        str = zend_string_alloc(0, 0);
 
        trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
-       ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(trace), index, key, frame) {
+       ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) {
                _build_trace_string(frame, index, &str, &num TSRMLS_CC);
        } ZEND_HASH_FOREACH_END();
 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 461225da99c34f4069c2400b5977da99be2cedca..e43743c1dc4671c9e23d545d48ea0b2daf425c6b 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1243,7 +1243,7 @@ ZEND_API void zend_timeout(int dummy) /* {{{ */
                zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
        }
 
-       zend_error(E_ERROR, "Maximum execution time of %d second%s exceeded", EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
+       zend_error(E_ERROR, "Maximum execution time of %pd second%s exceeded", EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
 }
 /* }}} */
 

diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 5508a40bdf15dc795a7d635615946c46677094fb..ae71312ade098be3f9bd1ffcdb6a1fc5681af4d2 100644 (file)
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -702,6 +702,11 @@ static inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht, HashPositio
        ZEND_HASH_FOREACH(ht, 0); \
        _h = _p->h; \
        _key = _p->key;
+
+#define ZEND_HASH_FOREACH_NUM_KEY_VAL(ht, _h, _val) \
+       ZEND_HASH_FOREACH(ht, 0); \
+       _h = _p->h; \
+       _val = _z;
                
 #define ZEND_HASH_FOREACH_STR_KEY_VAL(ht, _key, _val) \
        ZEND_HASH_FOREACH(ht, 0); \

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 0dcec0444b52637c07daf0a9b7c2169847b8802d..b41c4c3394559d0a09e7fd7d3ae52b3bc197270a 100644 (file)
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1897,7 +1897,7 @@ yy140:
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 445 "Zend/zend_ini_scanner.l"
                { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-       char *sc = NULL;
+       unsigned char *sc = NULL;
        while (YYCURSOR < YYLIMIT) {
                switch (*YYCURSOR) {
                        case '\n':

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 605d511f4fd2e3ec3743886651b41a75f77b5755..1ed800ce523baa677b725f8faf147c4fbe20ee4c 100644 (file)
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -443,7 +443,7 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 }
 
 <ST_RAW>{RAW_VALUE_CHARS} { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-       char *sc = NULL;
+       unsigned char *sc = NULL;
        while (YYCURSOR < YYLIMIT) {
                switch (*YYCURSOR) {
                        case '\n':

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 90fe7c45974bc2f86fba53dc5811fe46fa55193f..54a4e2a1136b17e1bd524914044e4a1d752094dc 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1002,7 +1002,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
                s = Z_STRVAL_P(zendlval);
                SCNG(output_filter)(&str, &sz, (unsigned char *)s, (size_t)Z_STRLEN_P(zendlval) TSRMLS_CC);
                zval_ptr_dtor(zendlval);
-               ZVAL_STRINGL(zendlval, str, sz);
+               ZVAL_STRINGL(zendlval, (char *) str, sz);
                efree(str);
        }
 }

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index fb016b4af836c639c9563a3a6c4ed8951ebf2a4d..fdb18c6e2788b86beba746baa8da84df63ee3489 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1000,7 +1000,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
                s = Z_STRVAL_P(zendlval);
                SCNG(output_filter)(&str, &sz, (unsigned char *)s, (size_t)Z_STRLEN_P(zendlval) TSRMLS_CC);
                zval_ptr_dtor(zendlval);
-               ZVAL_STRINGL(zendlval, str, sz);
+               ZVAL_STRINGL(zendlval, (char *) str, sz);
                efree(str);
        }
 }

diff --git a/Zend/zend_string.c b/Zend/zend_string.c
index 03ab71aff5e50979fca1530ebee8ac1112db5128..a9148f2c4a134cbb879e0228250837c215304e93 100644 (file)
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@ -34,12 +34,14 @@ ZEND_API zend_ulong zend_hash_func(const char *str, size_t len)
        return zend_inline_hash_func(str, len);
 }
 
+#ifndef ZTS
 static void _str_dtor(zval *zv)
 {
        zend_string *str = Z_STR_P(zv);
        GC_FLAGS(str) &= ~IS_STR_INTERNED;
        GC_REFCOUNT(str) = 1;
 }
+#endif
 
 void zend_interned_strings_init(TSRMLS_D)
 {

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 1586b4441cf8dffad852c26ddd91df4a8c00c633..07fd4bafb0cf684357a43e44d23a8379138326c3 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5962,11 +5962,9 @@ ZEND_VM_HANDLER(123, ZEND_TYPE_CHECK, CONST|TMP|VAR|CV, ANY)
 ZEND_VM_HANDLER(122, ZEND_DEFINED, CONST, ANY)
 {
        USE_OPLINE
-       zval *name;
        zend_constant *c;
 
        SAVE_OPLINE();
-       name = GET_OP1_ZVAL_PTR(BP_VAR_R);
        if (CACHED_PTR(Z_CACHE_SLOT_P(opline->op1.zv))) {
                ZVAL_TRUE(EX_VAR(opline->result.var));
        } else if ((c = zend_quick_get_constant(opline->op1.zv, 0 TSRMLS_CC)) == NULL) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index b772753ea406ebe7efbc6ab200f73255586f9362..0929507e9235d7030905858967c5a948f603483d 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3459,11 +3459,9 @@ static int ZEND_FASTCALL  ZEND_TYPE_CHECK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_DEFINED_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-       zval *name;
        zend_constant *c;
 
        SAVE_OPLINE();
-       name = opline->op1.zv;
        if (CACHED_PTR(Z_CACHE_SLOT_P(opline->op1.zv))) {
                ZVAL_TRUE(EX_VAR(opline->result.var));
        } else if ((c = zend_quick_get_constant(opline->op1.zv, 0 TSRMLS_CC)) == NULL) {