php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-09 17:13:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2

Browse Source
This commit is contained in:
Dmitry Stogov
2014-02-19 14:36:05 +04:00
parent 8bae1daa0c 757facf6c1
commit 9187abfaef
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_vm_def.h
View File

@@ -4681,7 +4681,7 @@ ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY)
EG(error_reporting_ini_entry)->value != EG(error_reporting_ini_entry)->orig_value)) {
efree(EG(error_reporting_ini_entry)->value);
}
EG(error_reporting_ini_entry)->value = Z_STRVAL(restored_error_reporting);
EG(error_reporting_ini_entry)->value = estrndup(Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting));
EG(error_reporting_ini_entry)->value_length = Z_STRLEN(restored_error_reporting);
} else {
zval_dtor(&restored_error_reporting);

2
Zend/zend_vm_execute.h
View File

@@ -8103,7 +8103,7 @@ static int ZEND_FASTCALL ZEND_END_SILENCE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_
EG(error_reporting_ini_entry)->value != EG(error_reporting_ini_entry)->orig_value)) {
efree(EG(error_reporting_ini_entry)->value);
}
EG(error_reporting_ini_entry)->value = Z_STRVAL(restored_error_reporting);
EG(error_reporting_ini_entry)->value = estrndup(Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting));
EG(error_reporting_ini_entry)->value_length = Z_STRLEN(restored_error_reporting);
} else {
zval_dtor(&restored_error_reporting);

7
ext/date/php_date.c
View File

@@ -4215,14 +4215,14 @@ PHP_FUNCTION(date_interval_create_from_date_string)
/* }}} */
/* {{{ date_interval_format - */
static char *date_interval_format(char *format, int format_len, timelib_rel_time *t)
static zend_string *date_interval_format(char *format, int format_len, timelib_rel_time *t)
{
smart_str string = {0};
int i, length, have_format_spec = 0;
char buffer[33];
if (!format_len) {
return estrdup("");
return STR_EMPTY_ALLOC();
}
for (i = 0; i < format_len; i++) {
@@ -4292,8 +4292,7 @@ PHP_FUNCTION(date_interval_format)
diobj = (php_interval_obj *) Z_OBJ_P(object);
DATE_CHECK_INITIALIZED(diobj->initialized, DateInterval);
//??? RETURN_STRING(date_interval_format(format, format_len, diobj->diff), 0);
RETURN_STRING(date_interval_format(format, format_len, diobj->diff));
RETURN_STR(date_interval_format(format, format_len, diobj->diff));
}
/* }}} */

4
ext/spl/spl_heap.c
View File

@@ -896,7 +896,7 @@ static zval *spl_heap_it_get_current_data(zend_object_iterator *iter TSRMLS_DC)
if (iterator->object->heap->flags & SPL_HEAP_CORRUPTED) {
zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0 TSRMLS_CC);
return;
return NULL;
}
if (iterator->object->heap->count == 0 || ZVAL_IS_UNDEF(element)) {
@@ -914,7 +914,7 @@ static zval *spl_pqueue_it_get_current_data(zend_object_iterator *iter TSRMLS_DC
if (iterator->object->heap->flags & SPL_HEAP_CORRUPTED) {
zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0 TSRMLS_CC);
return;
return NULL;
}
if (iterator->object->heap->count == 0 || ZVAL_IS_UNDEF(element)) {

6
sapi/phpdbg/phpdbg_info.c
View File

@@ -196,15 +196,15 @@ PHPDBG_INFO(literal) /* {{{ */
if (ops->function_name) {
if (ops->scope) {
phpdbg_notice(
"Literal Constants in %s::%s() (%d)", ops->scope->name, ops->function_name, count);
"Literal Constants in %s::%s() (%d)", ops->scope->name, ops->function_name->val, count);
} else {
phpdbg_notice(
"Literal Constants in %s() (%d)", ops->function_name, count);
"Literal Constants in %s() (%d)", ops->function_name->val, count);
}
} else {
if (ops->filename) {
phpdbg_notice(
"Literal Constants in %s (%d)", ops->filename, count);
"Literal Constants in %s (%d)", ops->filename->val, count);
} else {
phpdbg_notice(
"Literal Constants @ %p (%d)", ops, count);

2
sapi/phpdbg/phpdbg_list.c
View File

@@ -238,7 +238,7 @@ void phpdbg_list_function(const zend_function *fbc TSRMLS_DC) /* {{{ */
const zend_op_array *ops;
if (fbc->type != ZEND_USER_FUNCTION) {
phpdbg_error("The function requested (%s) is not user defined", fbc->common.function_name);
phpdbg_error("The function requested (%s) is not user defined", fbc->common.function_name->val);
return;
}

4
sapi/phpdbg/phpdbg_print.c
View File

@@ -155,7 +155,7 @@ PHPDBG_PRINT(class) /* {{{ */
(ce->ce_flags & ZEND_ACC_ABSTRACT) ?
"Abstract Class" :
"Class",
*ce->name->val);
ce->name->val);
phpdbg_writeln("Methods (%d):", zend_hash_num_elements(&ce->function_table));
if (zend_hash_num_elements(&ce->function_table)) {
@@ -197,7 +197,7 @@ PHPDBG_PRINT(method) /* {{{ */
if ((fbc = zend_hash_str_find_ptr(&ce->function_table, lcname, strlen(lcname))) != NULL) {
phpdbg_notice("%s Method %s",
(fbc->type == ZEND_USER_FUNCTION) ? "User" : "Internal",
fbc->common.function_name);
fbc->common.function_name->val);
phpdbg_print_function_helper(fbc TSRMLS_CC);
} else {