com php-src: fix datatype mismatch and warning: ext/standard/var.c

Commit: 2a7f9dcf5b254e5f8ded60a156115a405a42f882 Author: Anatol Belski <ab@php.net> Wed, 22 Oct 2014 09:37:25 +0200 Parents: 944d2c65e1e8da7e6aa4c960e9d616ecda1b67c6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a7f9dcf5b254e5f8ded60a156115a405a42f882 Log: fix datatype mismatch and warning Changed paths: M ext/standard/var.c Diff: diff --git a/ext/standard/var.c b/ext/standard/var.c index 4d00a4a..4f0bd24 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -594,7 +594,7 @@ PHP_FUNCTION(var_export) static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_data_t var_hash TSRMLS_DC); -static inline uint32_t php_add_var_hash(php_serialize_data_t data, zval *var TSRMLS_DC) /* {{{ */ +static inline zend_long php_add_var_hash(php_serialize_data_t data, zval *var TSRMLS_DC) /* {{{ */ { zval *zv; zend_ulong key; @@ -772,7 +772,7 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_pt static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_data_t var_hash TSRMLS_DC) /* {{{ */ { - uint32_t var_already; + zend_long var_already; HashTable *myht; if (EG(exception)) { @@ -816,7 +816,7 @@ again: smart_str_appendl(buf, "d:", 2); s = (char *) safe_emalloc(PG(serialize_precision), 1, MAX_LENGTH_OF_DOUBLE + 1); - php_gcvt(Z_DVAL_P(struc), PG(serialize_precision), '.', 'E', s); + php_gcvt(Z_DVAL_P(struc), (int)PG(serialize_precision), '.', 'E', s); smart_str_appends(buf, s); smart_str_appendc(buf, ';'); efree(s);