archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

first shot remove TSRMLS_* things

Browse source
This commit is contained in:
Anatol Belski 2014-12-13 23:06:14 +01:00
parent bb66f385d0
commit bdeb220f48
786 changed files with 27049 additions and 27411 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/intl/dateformat/dateformat_helpers.cpp
View file

@ -34,7 +34,7 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
intl_error *err,
Calendar*& cal,
zend_long& cal_int_type,
bool& calendar_owned TSRMLS_DC)
bool& calendar_owned)
{
char *msg;
UErrorCode status = UErrorCode();
@ -56,7 +56,7 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
"calendar) or IntlDateFormatter::GREGORIAN. "
"Alternatively, it can be an IntlCalendar object",
func_name);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);
efree(msg);
return FAILURE;
} else if (v == (zend_long)UCAL_TRADITIONAL) {
@ -70,13 +70,13 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
} else if (Z_TYPE_P(calendar_zv) == IS_OBJECT &&
instanceof_function_ex(Z_OBJCE_P(calendar_zv),
Calendar_ce_ptr, 0 TSRMLS_CC)) {
Calendar_ce_ptr, 0)) {
cal = calendar_fetch_native_calendar(calendar_zv TSRMLS_CC);
cal = calendar_fetch_native_calendar(calendar_zv);
if (cal == NULL) {
spprintf(&msg, 0, "%s: Found unconstructed IntlCalendar object",
func_name);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);
efree(msg);
return FAILURE;
}
@ -87,7 +87,7 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
} else {
spprintf(&msg, 0, "%s: Invalid calendar argument; should be an integer "
"or an IntlCalendar instance", func_name);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);
efree(msg);
return FAILURE;
}
@ -97,7 +97,7 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
}
if (U_FAILURE(status)) {
spprintf(&msg, 0, "%s: Failure instantiating calendar", func_name);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);
efree(msg);
return FAILURE;
}