com php-src: Fixed compiler warnings: Zend/zend_operators.c Zend/zend_operators.h
| From: | Xinchen Hui | Date: | Tue, 27 Aug 2013 07:44:30 +0000 |
| Subject: | com php-src: Fixed compiler warnings: Zend/zend_operators.c Zend/zend_operators.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73115@lists.php.net to get a copy of this message | ||
Commit: 0119bbba6b97e8657a92b0dc6327b04aad9532e7
Author: Xinchen Hui <laruence@php.net> Tue, 27 Aug 2013 15:44:30 +0800
Parents: 1c67a9940a7855bf485ae628d739d8c78ac6d1da
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0119bbba6b97e8657a92b0dc6327b04aad9532e7
Log:
Fixed compiler warnings
warning: 'local_dval' may be used uninitialized in this function
[-Wmaybe-uninitialized]
warning: 'dval2' may be used uninitialized in this function
[-Wmaybe-uninitialized]
Changed paths:
M Zend/zend_operators..c
M Zend/zend_operators.h
Diff:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 88995c4..5c84deb2 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -2138,8 +2138,8 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2) /* {{{ */
{
int ret1, ret2;
int oflow1, oflow2;
- long lval1, lval2;
- double dval1, dval2;
+ long lval1 = 0, lval2 = 0;
+ double dval1 = 0.0, dval2 = 0.0;
if ((ret1=is_numeric_string_ex(Z_STRVAL_P(s1), Z_STRLEN_P(s1), &lval1, &dval1, 0,
&oflow1)) &&
(ret2=is_numeric_string_ex(Z_STRVAL_P(s2), Z_STRLEN_P(s2), &lval2, &dval2, 0,
&oflow2))) {
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 0b890ff..6e7c1c0 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -132,7 +132,7 @@ static inline zend_uchar is_numeric_string_ex(const char *str, int length, long
{
const char *ptr;
int base = 10, digits = 0, dp_or_e = 0;
- double local_dval;
+ double local_dval = 0.0;
zend_uchar type;
if (!length) {