com php-src: Fix compiler warnings: Zend/zend_exceptions.c Zend/zend_execute_API.c Zend/zend_hash.h Zend/ zend_ini_scanner.c Zend/zend_ini_scanner.l
Zend /zend_language_scanner.c Zend/zend_language_scanner .l Zend/zend_string.c Zend/zend_vm_def.h Zend /zend_vm_execute.h
| From: | Nikita Popov | Date: | Mon, 25 Aug 2014 21:08:01 +0000 |
| Subject: | com php-src: Fix compiler warnings: Zend/zend_exceptions.c Zend/zend_execute_API.c Zend/zend_hash.h Zend/ zend_ini_scanner.c Zend/zend_ini_scanner.l Zend /zend_language_scanner.c Zend/zend_language_scanner .l Zend/zend_string.c Zend/zend_vm_def.h Zend /zend_vm_execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81096@lists.php.net to get a copy of this message | ||
Commit: d2a3bf9daf41471c93327d5aaafbef8a7dde9053
Author: Nikita Popov <nikic@php.net> Mon, 25 Aug 2014 23:05:05 +0200
Parents: 28e7beea66760ca0c175ccd908a77429d122da00
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d2a3bf9daf41471c93327d5aaafbef8a7dde9053
Log:
Fix compiler warnings
Changed paths:
M Zend/zend_exceptions.c
M Zend/zend_execute_API.c
M Zend/zend_hash.h
M Zend/zend_ini_scanner.c
M Zend/zend_ini_scanner.l
M Zend/zend_language_scanner.c
M Zend/zend_language_scanner.l
M Zend/zend_string.c
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index bec30cd..d8e183e 100644
--- 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 461225d..e43743c 100644
--- 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 5508a40..ae71312 100644
--- 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 0dcec04..b41c4c3 100644
--- 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 605d511..1ed800c 100644
--- 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 90fe7c4..54a4e2a 100644
--- 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 fb016b4..fdb18c6 100644
--- 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 03ab71a..a9148f2 100644
--- 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 1586b44..07fd4ba 100644
--- 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 b772753..0929507 100644
--- 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) {