Fixed assertions

2 files changed, 19 insertions, 19 deletions

diff --git a/ext/standard/type.c b/ext/standard/type.c
index 4488d4f1ae..facb1bad02 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -133,20 +133,20 @@ PHP_FUNCTION(settype)
    Get the integer value of a variable using the optional base for the conversion */
 PHP_FUNCTION(intval)
 {
-	zval **num;
+	zval *num;
 	long arg_base;
 	int base;
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:
-			if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &num) == FAILURE) {
+			if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &num) == FAILURE) {
 				return;
 			}
 			base = 10;
 			break;
 
 		case 2:
-			if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zl", &num, &arg_base) == FAILURE) {
+			if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &num, &arg_base) == FAILURE) {
 				return;
 			}
 			base = arg_base;
@@ -156,7 +156,7 @@ PHP_FUNCTION(intval)
 			WRONG_PARAM_COUNT;
 	}
 
-	RETVAL_ZVAL(*num, 1, 0);
+	RETVAL_ZVAL(num, 1, 0);
 	convert_to_long_base(return_value, base);
 }
 /* }}} */
@@ -165,13 +165,13 @@ PHP_FUNCTION(intval)
    Get the float value of a variable */
 PHP_FUNCTION(floatval)
 {
-	zval **num;
+	zval *num;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &num) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &num) == FAILURE) {
 		return;
 	}
 
-	RETVAL_ZVAL(*num, 1, 0);
+	RETVAL_ZVAL(num, 1, 0);
 	convert_to_double(return_value);
 }
 /* }}} */
@@ -180,13 +180,13 @@ PHP_FUNCTION(floatval)
    Get the boolean value of a variable */
 PHP_FUNCTION(boolval)
 {
-	zval **val;
+	zval *val;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &val) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &val) == FAILURE) {
 		return;
 	}
 
-	RETURN_BOOL(zend_is_true(*val TSRMLS_CC));
+	RETURN_BOOL(zend_is_true(val TSRMLS_CC));
 }
 /* }}} */
 
@@ -194,20 +194,20 @@ PHP_FUNCTION(boolval)
    Get the string value of a variable */
 PHP_FUNCTION(strval)
 {
-	zval **num, *tmp;
+	zval *num, *tmp;
 	zval expr_copy;
 	int use_copy;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &num) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &num) == FAILURE) {
 		return;
 	}
 
-	zend_make_printable_zval(*num, &expr_copy, &use_copy);
+	zend_make_printable_zval(num, &expr_copy, &use_copy);
 	if (use_copy) {
 		tmp = &expr_copy;
 		RETVAL_ZVAL(tmp, 0, 0);
 	} else {
-		RETVAL_ZVAL(*num, 1, 0);
+		RETVAL_ZVAL(num, 1, 0);
 	}
 }
 /* }}} */
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 1e2b85c055..2ce76cced1 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -251,21 +251,21 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level TSRMLS_DC) /* {{{ */
 
 	switch (Z_TYPE_P(struc)) {
 	case IS_BOOL:
-		php_printf("%sbool(%s) refcount(%u)\n", COMMON, Z_LVAL_P(struc)?"true":"false", Z_REFCOUNT_P(struc));
+		php_printf("%sbool(%s)\n", COMMON, Z_LVAL_P(struc)?"true":"false");
 		break;
 	case IS_NULL:
-		php_printf("%sNULL refcount(%u)\n", COMMON, Z_REFCOUNT_P(struc));
+		php_printf("%sNULL\n", COMMON);
 		break;
 	case IS_LONG:
-		php_printf("%slong(%ld) refcount(%u)\n", COMMON, Z_LVAL_P(struc), Z_REFCOUNT_P(struc));
+		php_printf("%slong(%ld)\n", COMMON, Z_LVAL_P(struc));
 		break;
 	case IS_DOUBLE:
-		php_printf("%sdouble(%.*G) refcount(%u)\n", COMMON, (int) EG(precision), Z_DVAL_P(struc), Z_REFCOUNT_P(struc));
+		php_printf("%sdouble(%.*G)\n", COMMON, (int) EG(precision), Z_DVAL_P(struc));
 		break;
 	case IS_STRING:
 		php_printf("%sstring(%d) \"", COMMON, Z_STRLEN_P(struc));
 		PHPWRITE(Z_STRVAL_P(struc), Z_STRLEN_P(struc));
-		php_printf("\" refcount(%u)\n", Z_REFCOUNT_P(struc));
+		php_printf("\" refcount(%u)\n", IS_INTERNED(Z_STR_P(struc)) ? 1 : Z_REFCOUNT_P(struc));
 		break;
 	case IS_ARRAY:
 		myht = Z_ARRVAL_P(struc);