From: Anatol Belski Date: Fri, 8 Apr 2016 12:17:57 +0000 (+0200) Subject: fix indent X-Git-Tag: php-7.0.6RC1~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73815573e0e483cc0f81145d53ae6308508bbd27;p=php fix indent --- diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp index 0e73fda01c..51ec063270 100644 --- a/ext/intl/dateformat/dateformat_create.cpp +++ b/ext/intl/dateformat/dateformat_create.cpp @@ -52,36 +52,35 @@ extern "C" { static int datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor) { zval *object; - const char *locale_str; - size_t locale_len = 0; + size_t locale_len = 0; Locale locale; - zend_long date_type = 0; - zend_long time_type = 0; + zend_long date_type = 0; + zend_long time_type = 0; zval *calendar_zv = NULL; - Calendar *calendar = NULL; + Calendar *calendar = NULL; zend_long calendar_type; bool calendar_owned; zval *timezone_zv = NULL; - TimeZone *timezone = NULL; + TimeZone *timezone = NULL; bool explicit_tz; - char* pattern_str = NULL; - size_t pattern_str_len = 0; - UChar* svalue = NULL; /* UTF-16 pattern_str */ - int32_t slength = 0; + char* pattern_str = NULL; + size_t pattern_str_len = 0; + UChar* svalue = NULL; /* UTF-16 pattern_str */ + int32_t slength = 0; IntlDateFormatter_object* dfo; int zpp_flags = is_constructor ? ZEND_PARSE_PARAMS_THROW : 0; intl_error_reset(NULL); object = return_value; /* Parse parameters. */ - if (zend_parse_parameters_ex(zpp_flags, ZEND_NUM_ARGS(), "sll|zzs", + if (zend_parse_parameters_ex(zpp_flags, ZEND_NUM_ARGS(), "sll|zzs", &locale_str, &locale_len, &date_type, &time_type, &timezone_zv, &calendar_zv, &pattern_str, &pattern_str_len) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: " "unable to parse input parameters", 0); return FAILURE; - } + } DATE_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK; @@ -150,7 +149,7 @@ static int datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor) } } - if (!U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) { + if (!U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) { DateFormat *df = (DateFormat*)DATE_FORMAT_OBJECT(dfo); if (calendar_owned) { df->adoptCalendar(calendar); @@ -162,7 +161,7 @@ static int datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor) if (timezone != NULL) { df->adoptTimeZone(timezone); } - } else { + } else { intl_error_set(NULL, INTL_DATA_ERROR_CODE(dfo), "datefmt_create: date " "formatter creation failed", 0); goto error;