From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/intl/msgformat/msgformat_helpers.cpp | 70 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'ext/intl/msgformat/msgformat_helpers.cpp') diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp index 46ebe25a17..93c4290601 100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp @@ -88,7 +88,7 @@ static void arg_types_dtor(zval *el) { } static HashTable *umsg_get_numeric_types(MessageFormatter_object *mfo, - intl_error& err TSRMLS_DC) + intl_error& err) { HashTable *ret; int32_t parts_count; @@ -114,7 +114,7 @@ static HashTable *umsg_get_numeric_types(MessageFormatter_object *mfo, const Formattable::Type t = types[i]; if (zend_hash_index_update_mem(ret, (zend_ulong)i, (void*)&t, sizeof(t)) == NULL) { intl_errors_set(&err, U_MEMORY_ALLOCATION_ERROR, - "Write to argument types hash table failed", 0 TSRMLS_CC); + "Write to argument types hash table failed", 0); break; } } @@ -134,7 +134,7 @@ static HashTable *umsg_get_numeric_types(MessageFormatter_object *mfo, #ifdef HAS_MESSAGE_PATTERN static HashTable *umsg_parse_format(MessageFormatter_object *mfo, const MessagePattern& mp, - intl_error& err TSRMLS_DC) + intl_error& err) { HashTable *ret; int32_t parts_count; @@ -144,7 +144,7 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, } if (!((MessageFormat *)mfo->mf_data.umsgf)->usesNamedArguments()) { - return umsg_get_numeric_types(mfo, err TSRMLS_CC); + return umsg_get_numeric_types(mfo, err); } if (mfo->mf_data.arg_types) { @@ -189,7 +189,7 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, if ((storedType = (Formattable::Type*)zend_hash_str_update_mem(ret, (char*)argName.getBuffer(), argName.length(), (void*)&bogusType, sizeof(bogusType))) == NULL) { intl_errors_set(&err, U_MEMORY_ALLOCATION_ERROR, - "Write to argument types hash table failed", 0 TSRMLS_CC); + "Write to argument types hash table failed", 0); continue; } } @@ -197,7 +197,7 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, int32_t argNumber = name_part.getValue(); if (argNumber < 0) { intl_errors_set(&err, U_INVALID_FORMAT_ERROR, - "Found part with negative number", 0 TSRMLS_CC); + "Found part with negative number", 0); continue; } if ((storedType = (Formattable::Type*)zend_hash_index_find_ptr(ret, (zend_ulong)argNumber)) == NULL) { @@ -205,12 +205,12 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, Formattable::Type bogusType = Formattable::kObject; if ((storedType = (Formattable::Type*)zend_hash_index_update_mem(ret, (zend_ulong)argNumber, (void*)&bogusType, sizeof(bogusType))) == NULL) { intl_errors_set(&err, U_MEMORY_ALLOCATION_ERROR, - "Write to argument types hash table failed", 0 TSRMLS_CC); + "Write to argument types hash table failed", 0); continue; } } } else { - intl_errors_set(&err, U_INVALID_FORMAT_ERROR, "Invalid part type encountered", 0 TSRMLS_CC); + intl_errors_set(&err, U_INVALID_FORMAT_ERROR, "Invalid part type encountered", 0); continue; } @@ -255,7 +255,7 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, * is broken. */ intl_errors_set(&err, U_PARSE_ERROR, "Expected UMSGPAT_PART_TYPE_ARG_TYPE part following " - "UMSGPAT_ARG_TYPE_SIMPLE part", 0 TSRMLS_CC); + "UMSGPAT_ARG_TYPE_SIMPLE part", 0); continue; } } else if (argType == UMSGPAT_ARG_TYPE_PLURAL) { @@ -272,7 +272,7 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, /* We found a different type for the same arg! */ if (*storedType != Formattable::kObject && *storedType != type) { intl_errors_set(&err, U_ARGUMENT_TYPE_MISMATCH, - "Inconsistent types declared for an argument", 0 TSRMLS_CC); + "Inconsistent types declared for an argument", 0); continue; } @@ -293,27 +293,27 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, #endif static HashTable *umsg_get_types(MessageFormatter_object *mfo, - intl_error& err TSRMLS_DC) + intl_error& err) { MessageFormat *mf = (MessageFormat *)mfo->mf_data.umsgf; #ifdef HAS_MESSAGE_PATTERN const MessagePattern mp = MessageFormatAdapter::getMessagePattern(mf); - return umsg_parse_format(mfo, mp, err TSRMLS_CC); + return umsg_parse_format(mfo, mp, err); #else if (mf->usesNamedArguments()) { intl_errors_set(&err, U_UNSUPPORTED_ERROR, "This extension supports named arguments only on ICU 4.8+", - 0 TSRMLS_CC); + 0); return NULL; } - return umsg_get_numeric_types(mfo, err TSRMLS_CC); + return umsg_get_numeric_types(mfo, err); #endif } static void umsg_set_timezone(MessageFormatter_object *mfo, - intl_error& err TSRMLS_DC) + intl_error& err) { MessageFormat *mf = (MessageFormat *)mfo->mf_data.umsgf; TimeZone *used_tz = NULL; @@ -333,7 +333,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo, if (formats == NULL) { intl_errors_set(&err, U_MEMORY_ALLOCATION_ERROR, - "Out of memory retrieving subformats", 0 TSRMLS_CC); + "Out of memory retrieving subformats", 0); } for (int i = 0; U_SUCCESS(err.code) && i < count; i++) { @@ -346,7 +346,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo, if (used_tz == NULL) { zval nullzv, *zvptr = &nullzv; ZVAL_NULL(zvptr); - used_tz = timezone_process_timezone_argument(zvptr, &err, "msgfmt_format" TSRMLS_CC); + used_tz = timezone_process_timezone_argument(zvptr, &err, "msgfmt_format"); if (used_tz == NULL) { continue; } @@ -363,7 +363,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo, U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, HashTable *args, UChar **formatted, - int *formatted_len TSRMLS_DC) + int *formatted_len) { int arg_count = zend_hash_num_elements(args); std::vector fargs; @@ -376,9 +376,9 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, return; } - types = umsg_get_types(mfo, err TSRMLS_CC); + types = umsg_get_types(mfo, err); - umsg_set_timezone(mfo, err TSRMLS_CC); + umsg_set_timezone(mfo, err); fargs.resize(arg_count); farg_names.resize(arg_count); @@ -403,7 +403,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, /* includes case where index < 0 because it's exposed as unsigned */ if (num_index > (zend_ulong)INT32_MAX) { intl_errors_set(&err, U_ILLEGAL_ARGUMENT_ERROR, - "Found negative or too large array key", 0 TSRMLS_CC); + "Found negative or too large array key", 0); continue; } @@ -419,7 +419,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, char *message; spprintf(&message, 0, "Invalid UTF-8 data in argument key: '%s'", str_index->val); - intl_errors_set(&err, err.code, message, 1 TSRMLS_CC); + intl_errors_set(&err, err.code, message, 1); efree(message); continue; } @@ -453,7 +453,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, char *message; spprintf(&message, 0, "Invalid UTF-8 data in string argument: " "'%s'", Z_STRVAL_P(elem)); - intl_errors_set(&err, err.code, message, 1 TSRMLS_CC); + intl_errors_set(&err, err.code, message, 1); efree(message); delete text; continue; @@ -470,7 +470,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, d = (double)Z_LVAL_P(elem); } else { SEPARATE_ZVAL_IF_NOT_REF(elem); - convert_scalar_to_number(elem TSRMLS_CC); + convert_scalar_to_number(elem); d = (Z_TYPE_P(elem) == IS_DOUBLE) ? Z_DVAL_P(elem) : (double)Z_LVAL_P(elem); @@ -487,7 +487,7 @@ retry_klong: Z_DVAL_P(elem) < (double)INT32_MIN) { intl_errors_set(&err, U_ILLEGAL_ARGUMENT_ERROR, "Found PHP float with absolute value too large for " - "32 bit integer argument", 0 TSRMLS_CC); + "32 bit integer argument", 0); } else { tInt32 = (int32_t)Z_DVAL_P(elem); } @@ -496,13 +496,13 @@ retry_klong: Z_LVAL_P(elem) < INT32_MIN) { intl_errors_set(&err, U_ILLEGAL_ARGUMENT_ERROR, "Found PHP integer with absolute value too large " - "for 32 bit integer argument", 0 TSRMLS_CC); + "for 32 bit integer argument", 0); } else { tInt32 = (int32_t)Z_LVAL_P(elem); } } else { SEPARATE_ZVAL_IF_NOT_REF(elem); - convert_scalar_to_number(elem TSRMLS_CC); + convert_scalar_to_number(elem); goto retry_klong; } formattable.setLong(tInt32); @@ -517,7 +517,7 @@ retry_kint64: Z_DVAL_P(elem) < (double)U_INT64_MIN) { intl_errors_set(&err, U_ILLEGAL_ARGUMENT_ERROR, "Found PHP float with absolute value too large for " - "64 bit integer argument", 0 TSRMLS_CC); + "64 bit integer argument", 0); } else { tInt64 = (int64_t)Z_DVAL_P(elem); } @@ -526,7 +526,7 @@ retry_kint64: tInt64 = (int64_t)Z_LVAL_P(elem); } else { SEPARATE_ZVAL_IF_NOT_REF(elem); - convert_scalar_to_number(elem TSRMLS_CC); + convert_scalar_to_number(elem); goto retry_kint64; } formattable.setInt64(tInt64); @@ -534,7 +534,7 @@ retry_kint64: } case Formattable::kDate: { - double dd = intl_zval_to_millis(elem, &err, "msgfmt_format" TSRMLS_CC); + double dd = intl_zval_to_millis(elem, &err, "msgfmt_format"); if (U_FAILURE(err.code)) { char *message, *key_char; int key_len; @@ -543,7 +543,7 @@ retry_kint64: &status) == SUCCESS) { spprintf(&message, 0, "The argument for key '%s' " "cannot be used as a date or time", key_char); - intl_errors_set(&err, err.code, message, 1 TSRMLS_CC); + intl_errors_set(&err, err.code, message, 1); efree(key_char); efree(message); } @@ -554,7 +554,7 @@ retry_kint64: } default: intl_errors_set(&err, U_ILLEGAL_ARGUMENT_ERROR, - "Found unsupported argument type", 0 TSRMLS_CC); + "Found unsupported argument type", 0); break; } } else { @@ -589,7 +589,7 @@ retry_kint64: "value given for the argument with key '%s' " "is available", key_char); intl_errors_set(&err, - U_ILLEGAL_ARGUMENT_ERROR, message, 1 TSRMLS_CC); + U_ILLEGAL_ARGUMENT_ERROR, message, 1); efree(key_char); efree(message); } @@ -612,7 +612,7 @@ retry_kint64: if (U_FAILURE(err.code)) { intl_errors_set(&err, err.code, - "Call to ICU MessageFormat::format() has failed", 0 TSRMLS_CC); + "Call to ICU MessageFormat::format() has failed", 0); return; } @@ -621,7 +621,7 @@ retry_kint64: resultStr.extract(*formatted, *formatted_len+1, err.code); if (U_FAILURE(err.code)) { intl_errors_set(&err, err.code, - "Error copying format() result", 0 TSRMLS_CC); + "Error copying format() result", 0); return; } } -- cgit v1.2.1