archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add smart_str_append for appending zend_strings

Browse source 
Also replaces usages in Zend/ and ext/standard
This commit is contained in:
Nikita Popov 2014-09-21 20:47:07 +02:00
parent 2a7de9fdbb
commit a770d29df7
14 changed files with 41 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Zend/zend_exceptions.c
View file

@ -342,7 +342,7 @@ ZEND_METHOD(error_exception, getSeverity)
zend_error(E_WARNING, "Value for %s is no string", key); \
smart_str_appends(str, "[unknown]"); \
} else { \
smart_str_appendl(str, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); \
smart_str_append(str, Z_STR_P(tmp)); \
} \
} \
} while (0)
@ -454,14 +454,11 @@ static void _build_trace_args(zval *arg, smart_str *str TSRMLS_DC) /* {{{ */
case IS_ARRAY:
smart_str_appends(str, "Array, ");
break;
case IS_OBJECT: {
zend_string *class_name = zend_get_object_classname(Z_OBJ_P(arg) TSRMLS_CC);
case IS_OBJECT:
smart_str_appends(str, "Object(");
smart_str_appendl(str, class_name->val, class_name->len);
smart_str_append(str, zend_get_object_classname(Z_OBJ_P(arg) TSRMLS_CC));
smart_str_appends(str, "), ");
break;
}
}
}
/* }}} */
@ -492,7 +489,7 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num TSRM
} else {
line = 0;
}
smart_str_appendl(str, Z_STRVAL_P(file), Z_STRLEN_P(file));
smart_str_append(str, Z_STR_P(file));
smart_str_appendc(str, '(');
smart_str_append_long(str, line);
smart_str_appends(str, "): ");