Skip to content

Commit 08aa56c

Browse files
formatting fixes
1 parent 27da6a1 commit 08aa56c

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

ext/intl/rangeformatter/rangeformatter_class.cpp

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extern "C" {
2727
#include "../intl_data.h"
2828
#include "rangeformatter_arginfo.h"
2929
#include "rangeformatter_class.h"
30-
#include "intl_convert.h"
30+
#include "intl_convert.h"
3131
}
3232

3333
using icu::number::NumberRangeFormatter;
@@ -45,16 +45,16 @@ zend_object *IntlNumberRangeFormatter_object_create(zend_class_entry *ce)
4545
IntlNumberRangeFormatter_object* intern;
4646

4747
intern = reinterpret_cast<IntlNumberRangeFormatter_object*>(zend_object_alloc(sizeof(IntlNumberRangeFormatter_object), ce));
48-
zend_object_std_init(&intern->zo, ce);
49-
object_properties_init(&intern->zo, ce);
48+
zend_object_std_init(&intern->zo, ce);
49+
object_properties_init(&intern->zo, ce);
5050

51-
// Initialize rangeformatter_data structure
52-
intl_error_init(&intern->nrf_data.error);
53-
intern->nrf_data.unumrf = nullptr;
51+
// Initialize rangeformatter_data structure
52+
intl_error_init(&intern->nrf_data.error);
53+
intern->nrf_data.unumrf = nullptr;
5454

5555
intern->zo.handlers = &rangeformatter_handlers;
5656

57-
return &intern->zo;
57+
return &intern->zo;
5858
}
5959

6060
U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, __construct)
@@ -65,10 +65,10 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, __construct)
6565

6666
U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
6767
{
68-
#if U_ICU_VERSION_MAJOR_NUM < 63
69-
zend_throw_error(NULL, "IntlNumberRangeFormatter is not available in ICU 62 and earlier");
70-
RETURN_THROWS();
71-
#endif
68+
#if U_ICU_VERSION_MAJOR_NUM < 63
69+
zend_throw_error(NULL, "IntlNumberRangeFormatter is not available in ICU 62 and earlier");
70+
RETURN_THROWS();
71+
#endif
7272

7373
char* skeleton;
7474
char* locale;
@@ -88,7 +88,7 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
8888
zend_argument_must_not_be_empty_error(1);
8989
RETURN_THROWS();
9090
}
91-
91+
9292
if (locale_len == 0) {
9393
locale = (char *)intl_locale_get_default();
9494
}
@@ -138,7 +138,6 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
138138
RANGEFORMATTER_OBJECT(php_intl_numberrangeformatter_fetch_object(obj)) = nrf;
139139

140140
RETURN_OBJ(obj);
141-
142141
}
143142

144143
U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, format)
@@ -166,15 +165,15 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, format)
166165
RETURN_THROWS();
167166
}
168167

169-
zend_string *ret = intl_charFromString(result, &error);
168+
zend_string *ret = intl_charFromString(result, &error);
170169

171-
if (U_FAILURE(error)) {
170+
if (U_FAILURE(error)) {
172171
intl_error_set(NULL, error, "Failed to convert result to UTF-8");
173172
zend_throw_exception(IntlException_ce_ptr, "Failed to convert result to UTF-8", 0);
174173
RETURN_THROWS();
175-
}
174+
}
176175

177-
RETVAL_NEW_STR(ret);
176+
RETVAL_NEW_STR(ret);
178177
}
179178

180179
U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, getErrorCode)
@@ -197,7 +196,7 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, getErrorMessage)
197196

198197
void IntlNumberRangeFormatter_object_free(zend_object *object)
199198
{
200-
IntlNumberRangeFormatter_object* nfo = php_intl_numberrangeformatter_fetch_object(object);
199+
IntlNumberRangeFormatter_object* nfo = php_intl_numberrangeformatter_fetch_object(object);
201200

202201
if (nfo->nrf_data.unumrf) {
203202
delete nfo->nrf_data.unumrf;
@@ -206,14 +205,14 @@ void IntlNumberRangeFormatter_object_free(zend_object *object)
206205

207206
intl_error_reset(&nfo->nrf_data.error);
208207

209-
zend_object_std_dtor(&nfo->zo);
208+
zend_object_std_dtor(&nfo->zo);
210209
}
211210

212211
void rangeformatter_register_class(void)
213212
{
214213
class_entry_IntlNumberRangeFormatter = register_class_IntlNumberRangeFormatter();
215214
class_entry_IntlNumberRangeFormatter->create_object = IntlNumberRangeFormatter_object_create;
216-
215+
217216
memcpy(&rangeformatter_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
218217
rangeformatter_handlers.offset = XtOffsetOf(IntlNumberRangeFormatter_object, zo);
219218
rangeformatter_handlers.free_obj = IntlNumberRangeFormatter_object_free;

0 commit comments

Comments
 (0)