Skip to content

Commit 1e81a68

Browse files
viestviest
authored
Merge pull request #234 from viest/dev
Upgrade bundled libxlsxio to 0.2.22
2 parents 452ecf9 + 397cde1 commit 1e81a68

File tree

11 files changed

+137
-70
lines changed

11 files changed

+137
-70
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
branch = R_2_2_7
99
[submodule "library/libxlsxio"]
1010
path = library/libxlsxio
11-
url = https://github.com/brechtsanders/xlsxio.git
12-
branch = 0.2.21
11+
url = https://github.com/viest/xlsxio.git
12+
branch = 0.2.22

‎include/excel.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#define V_XLS_CONST_READ_SKIP_NONE "SKIP_NONE"
2828
#define V_XLS_CONST_READ_SKIP_EMPTY_ROW "SKIP_EMPTY_ROW"
2929
#define V_XLS_CONST_READ_SKIP_EMPTY_CELLS "SKIP_EMPTY_CELLS"
30+
#define V_XLS_CONST_READ_SKIP_EMPTY_VALUE "SKIP_EMPTY_VALUE"
3031

3132
#define READ_TYPE_EMPTY 0x00
3233
#define READ_TYPE_STRING 0x01

‎include/read.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515

1616
#define READ_SKIP_ROW 0
1717
#define READ_ROW 0x01
18+
#define SKIP_EMPTY_VALUE 0x100
1819

1920
int is_number(const char *value);
2021
void data_to_null(zval *zv_result_t);
2122
int sheet_read_row(xlsxioreadersheet sheet_t);
2223
void sheet_list(xlsxioreader file_t, zval *zv_result_t);
2324
xlsxioreader file_open(const char *directory, const char *file_name);
24-
void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_result_t);
2525
void load_sheet_all_data(xlsxioreadersheet sheet_t, zval *zv_type_t, zval *zv_result_t);
2626
xlsxioreadersheet sheet_open(xlsxioreader file_t, const zend_string *zs_sheet_name_t, const zend_long zl_flag);
2727
unsigned int load_sheet_current_row_data(xlsxioreadersheet sheet_t, zval *zv_result_t, zval *zv_type, unsigned int flag);
2828
unsigned int load_sheet_current_row_data_callback(zend_string *zs_sheet_name_t, xlsxioreader file_t, void *callback_data);
29+
void data_to_custom_type(const char *string_value, const zend_ulong type, zval *zv_result_t, const zend_ulong zv_hashtable_index);
2930

3031
#endif //PHP_READ_INCLUDE_H

‎kernel/chart.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ ZEND_END_ARG_INFO()
9090
ZEND_BEGIN_ARG_INFO_EX(chart_legend_set_position_arginfo, 0, 0, 1)
9191
ZEND_ARG_INFO(0, type)
9292
ZEND_END_ARG_INFO()
93+
94+
ZEND_BEGIN_ARG_INFO_EX(chart_to_resource_arginfo, 0, 0, 0)
95+
ZEND_END_ARG_INFO()
9396
/* }}} */
9497

9598
/** {{{ \Vtiful\Kernel\Chart::__construct(resource $handle, int $type)
@@ -279,7 +282,7 @@ zend_function_entry chart_methods[] = {
279282
PHP_ME(vtiful_chart, axisNameX, chart_axis_name_arginfo, ZEND_ACC_PUBLIC)
280283
PHP_ME(vtiful_chart, title, chart_title_name_arginfo, ZEND_ACC_PUBLIC)
281284
PHP_ME(vtiful_chart, legendSetPosition, chart_legend_set_position_arginfo, ZEND_ACC_PUBLIC)
282-
PHP_ME(vtiful_chart, toResource, NULL, ZEND_ACC_PUBLIC)
285+
PHP_ME(vtiful_chart, toResource, chart_to_resource_arginfo, ZEND_ACC_PUBLIC)
283286
PHP_FE_END
284287
};
285288
/* }}} */

‎kernel/excel.c‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ ZEND_BEGIN_ARG_INFO_EX(xls_data_arginfo, 0, 0, 1)
9696
ZEND_ARG_INFO(0, data)
9797
ZEND_END_ARG_INFO()
9898

99+
ZEND_BEGIN_ARG_INFO_EX(xls_output_arginfo, 0, 0, 0)
100+
ZEND_END_ARG_INFO()
101+
102+
ZEND_BEGIN_ARG_INFO_EX(xls_get_handle_arginfo, 0, 0, 0)
103+
ZEND_END_ARG_INFO()
104+
99105
ZEND_BEGIN_ARG_INFO_EX(xls_insert_text_arginfo, 0, 0, 5)
100106
ZEND_ARG_INFO(0, row)
101107
ZEND_ARG_INFO(0, column)
@@ -189,6 +195,16 @@ ZEND_BEGIN_ARG_INFO_EX(xls_put_csv_callback_arginfo, 0, 0, 2)
189195
ZEND_ARG_INFO(0, escape_str)
190196
ZEND_END_ARG_INFO()
191197

198+
ZEND_BEGIN_ARG_INFO_EX(xls_sheet_list_arginfo, 0, 0, 0)
199+
ZEND_END_ARG_INFO()
200+
201+
ZEND_BEGIN_ARG_INFO_EX(xls_get_sheet_data_arginfo, 0, 0, 0)
202+
ZEND_END_ARG_INFO()
203+
204+
ZEND_BEGIN_ARG_INFO_EX(xls_next_row_arginfo, 0, 0, 0)
205+
ZEND_ARG_INFO(0, zv_type_t)
206+
ZEND_END_ARG_INFO()
207+
192208
ZEND_BEGIN_ARG_INFO_EX(xls_set_type_arginfo, 0, 0, 1)
193209
ZEND_ARG_INFO(0, zv_type_t)
194210
ZEND_END_ARG_INFO()
@@ -1092,11 +1108,11 @@ PHP_METHOD(vtiful_xls, getSheetData)
10921108
*/
10931109
PHP_METHOD(vtiful_xls, nextRow)
10941110
{
1095-
zval *zv_type = NULL;
1111+
zval *zv_type_t = NULL;
10961112

10971113
ZEND_PARSE_PARAMETERS_START(0, 1)
10981114
Z_PARAM_OPTIONAL
1099-
Z_PARAM_ARRAY(zv_type)
1115+
Z_PARAM_ARRAY(zv_type_t)
11001116
ZEND_PARSE_PARAMETERS_END();
11011117

11021118
xls_object *obj = Z_XLS_P(getThis());
@@ -1105,11 +1121,11 @@ PHP_METHOD(vtiful_xls, nextRow)
11051121
RETURN_FALSE;
11061122
}
11071123

1108-
if (zv_type == NULL) {
1109-
zv_type = zend_read_property(vtiful_xls_ce, getThis(), ZEND_STRL(V_XLS_TYPE), 0, NULL);
1124+
if (zv_type_t == NULL) {
1125+
zv_type_t = zend_read_property(vtiful_xls_ce, getThis(), ZEND_STRL(V_XLS_TYPE), 0, NULL);
11101126
}
11111127

1112-
load_sheet_current_row_data(obj->read_ptr.sheet_t, return_value, zv_type, READ_ROW);
1128+
load_sheet_current_row_data(obj->read_ptr.sheet_t, return_value, zv_type_t, READ_ROW);
11131129
}
11141130
/* }}} */
11151131

@@ -1156,8 +1172,8 @@ zend_function_entry xls_methods[] = {
11561172
PHP_ME(vtiful_xls, constMemory, xls_const_memory_arginfo, ZEND_ACC_PUBLIC)
11571173
PHP_ME(vtiful_xls, header, xls_header_arginfo, ZEND_ACC_PUBLIC)
11581174
PHP_ME(vtiful_xls, data, xls_data_arginfo, ZEND_ACC_PUBLIC)
1159-
PHP_ME(vtiful_xls, output, NULL, ZEND_ACC_PUBLIC)
1160-
PHP_ME(vtiful_xls, getHandle, NULL, ZEND_ACC_PUBLIC)
1175+
PHP_ME(vtiful_xls, output, xls_output_arginfo, ZEND_ACC_PUBLIC)
1176+
PHP_ME(vtiful_xls, getHandle, xls_get_handle_arginfo, ZEND_ACC_PUBLIC)
11611177
PHP_ME(vtiful_xls, autoFilter, xls_auto_filter_arginfo, ZEND_ACC_PUBLIC)
11621178
PHP_ME(vtiful_xls, insertText, xls_insert_text_arginfo, ZEND_ACC_PUBLIC)
11631179
PHP_ME(vtiful_xls, insertDate, xls_insert_date_arginfo, ZEND_ACC_PUBLIC)
@@ -1182,10 +1198,10 @@ zend_function_entry xls_methods[] = {
11821198
PHP_ME(vtiful_xls, openSheet, xls_open_sheet_arginfo, ZEND_ACC_PUBLIC)
11831199
PHP_ME(vtiful_xls, putCSV, xls_put_csv_arginfo, ZEND_ACC_PUBLIC)
11841200
PHP_ME(vtiful_xls, putCSVCallback, xls_put_csv_callback_arginfo, ZEND_ACC_PUBLIC)
1185-
PHP_ME(vtiful_xls, sheetList, NULL, ZEND_ACC_PUBLIC)
1201+
PHP_ME(vtiful_xls, sheetList, xls_sheet_list_arginfo, ZEND_ACC_PUBLIC)
11861202
PHP_ME(vtiful_xls, setType, xls_set_type_arginfo, ZEND_ACC_PUBLIC)
1187-
PHP_ME(vtiful_xls, getSheetData, NULL, ZEND_ACC_PUBLIC)
1188-
PHP_ME(vtiful_xls, nextRow, NULL, ZEND_ACC_PUBLIC)
1203+
PHP_ME(vtiful_xls, getSheetData, xls_get_sheet_data_arginfo, ZEND_ACC_PUBLIC)
1204+
PHP_ME(vtiful_xls, nextRow, xls_next_row_arginfo, ZEND_ACC_PUBLIC)
11891205
PHP_ME(vtiful_xls, nextCellCallback, xls_next_cell_callback_arginfo, ZEND_ACC_PUBLIC)
11901206
#endif
11911207

@@ -1214,6 +1230,7 @@ VTIFUL_STARTUP_FUNCTION(excel) {
12141230
REGISTER_CLASS_CONST_LONG(vtiful_xls_ce, V_XLS_CONST_READ_SKIP_NONE, XLSXIOREAD_SKIP_NONE);
12151231
REGISTER_CLASS_CONST_LONG(vtiful_xls_ce, V_XLS_CONST_READ_SKIP_EMPTY_ROW, XLSXIOREAD_SKIP_EMPTY_ROWS);
12161232
REGISTER_CLASS_CONST_LONG(vtiful_xls_ce, V_XLS_CONST_READ_SKIP_EMPTY_CELLS, XLSXIOREAD_SKIP_EMPTY_CELLS);
1233+
REGISTER_CLASS_CONST_LONG(vtiful_xls_ce, V_XLS_CONST_READ_SKIP_EMPTY_VALUE, SKIP_EMPTY_VALUE);
12171234
#endif
12181235

12191236
REGISTER_CLASS_CONST_LONG(vtiful_xls_ce, "GRIDLINES_HIDE_ALL", LXW_HIDE_ALL_GRIDLINES)

‎kernel/format.c‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ ZEND_BEGIN_ARG_INFO_EX(format_construct_arginfo, 0, 0, 1)
5959
ZEND_ARG_INFO(0, handle)
6060
ZEND_END_ARG_INFO()
6161

62+
ZEND_BEGIN_ARG_INFO_EX(format_wrap_arginfo, 0, 0, 0)
63+
ZEND_END_ARG_INFO()
64+
65+
ZEND_BEGIN_ARG_INFO_EX(format_bold_arginfo, 0, 0, 0)
66+
ZEND_END_ARG_INFO()
67+
68+
ZEND_BEGIN_ARG_INFO_EX(format_italic_arginfo, 0, 0, 0)
69+
ZEND_END_ARG_INFO()
70+
6271
ZEND_BEGIN_ARG_INFO_EX(format_underline_arginfo, 0, 0, 1)
6372
ZEND_ARG_INFO(0, style)
6473
ZEND_END_ARG_INFO()
@@ -75,6 +84,9 @@ ZEND_BEGIN_ARG_INFO_EX(format_size_arginfo, 0, 0, 1)
7584
ZEND_ARG_INFO(0, size)
7685
ZEND_END_ARG_INFO()
7786

87+
ZEND_BEGIN_ARG_INFO_EX(format_strikeout_arginfo, 0, 0, 0)
88+
ZEND_END_ARG_INFO()
89+
7890
ZEND_BEGIN_ARG_INFO_EX(format_number_arginfo, 0, 0, 1)
7991
ZEND_ARG_INFO(0, format)
8092
ZEND_END_ARG_INFO()
@@ -91,6 +103,9 @@ ZEND_END_ARG_INFO()
91103
ZEND_BEGIN_ARG_INFO_EX(format_font_arginfo, 0, 0, 1)
92104
ZEND_ARG_INFO(0, font)
93105
ZEND_END_ARG_INFO()
106+
107+
ZEND_BEGIN_ARG_INFO_EX(format_to_resource_arginfo, 0, 0, 0)
108+
ZEND_END_ARG_INFO()
94109
/* }}} */
95110

96111
/** {{{ \Vtiful\Kernel\Format::__construct()
@@ -358,20 +373,20 @@ PHP_METHOD(vtiful_format, toResource)
358373
/** {{{ format_methods
359374
*/
360375
zend_function_entry format_methods[] = {
361-
PHP_ME(vtiful_format, __construct, format_construct_arginfo, ZEND_ACC_PUBLIC)
362-
PHP_ME(vtiful_format, wrap, NULL, ZEND_ACC_PUBLIC)
363-
PHP_ME(vtiful_format, bold, NULL, ZEND_ACC_PUBLIC)
364-
PHP_ME(vtiful_format, italic, NULL, ZEND_ACC_PUBLIC)
365-
PHP_ME(vtiful_format, border, format_border_arginfo, ZEND_ACC_PUBLIC)
366-
PHP_ME(vtiful_format, align, format_align_arginfo, ZEND_ACC_PUBLIC)
367-
PHP_ME(vtiful_format, number, format_number_arginfo, ZEND_ACC_PUBLIC)
368-
PHP_ME(vtiful_format, fontColor, format_color_arginfo, ZEND_ACC_PUBLIC)
369-
PHP_ME(vtiful_format, font, format_font_arginfo, ZEND_ACC_PUBLIC)
370-
PHP_ME(vtiful_format, fontSize, format_size_arginfo, ZEND_ACC_PUBLIC)
371-
PHP_ME(vtiful_format, strikeout, NULL, ZEND_ACC_PUBLIC)
372-
PHP_ME(vtiful_format, underline, format_underline_arginfo, ZEND_ACC_PUBLIC)
373-
PHP_ME(vtiful_format, toResource, NULL, ZEND_ACC_PUBLIC)
374-
PHP_ME(vtiful_format, background, format_background_arginfo, ZEND_ACC_PUBLIC)
376+
PHP_ME(vtiful_format, __construct, format_construct_arginfo, ZEND_ACC_PUBLIC)
377+
PHP_ME(vtiful_format, wrap, format_wrap_arginfo, ZEND_ACC_PUBLIC)
378+
PHP_ME(vtiful_format, bold, format_bold_arginfo, ZEND_ACC_PUBLIC)
379+
PHP_ME(vtiful_format, italic, format_italic_arginfo, ZEND_ACC_PUBLIC)
380+
PHP_ME(vtiful_format, border, format_border_arginfo, ZEND_ACC_PUBLIC)
381+
PHP_ME(vtiful_format, align, format_align_arginfo, ZEND_ACC_PUBLIC)
382+
PHP_ME(vtiful_format, number, format_number_arginfo, ZEND_ACC_PUBLIC)
383+
PHP_ME(vtiful_format, fontColor, format_color_arginfo, ZEND_ACC_PUBLIC)
384+
PHP_ME(vtiful_format, font, format_font_arginfo, ZEND_ACC_PUBLIC)
385+
PHP_ME(vtiful_format, fontSize, format_size_arginfo, ZEND_ACC_PUBLIC)
386+
PHP_ME(vtiful_format, strikeout, format_strikeout_arginfo, ZEND_ACC_PUBLIC)
387+
PHP_ME(vtiful_format, underline, format_underline_arginfo, ZEND_ACC_PUBLIC)
388+
PHP_ME(vtiful_format, toResource, format_to_resource_arginfo, ZEND_ACC_PUBLIC)
389+
PHP_ME(vtiful_format, background, format_background_arginfo, ZEND_ACC_PUBLIC)
375390
PHP_FE_END
376391
};
377392
/* }}} */

‎kernel/read.c‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,16 @@ void data_to_null(zval *zv_result_t)
8686
/* }}} */
8787

8888
/* {{{ */
89-
void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_result_t)
89+
void data_to_custom_type(const char *string_value, const zend_ulong type, zval *zv_result_t, const zend_ulong zv_hashtable_index)
9090
{
91+
size_t string_value_length = strlen(string_value);
92+
9193
if (type & READ_TYPE_DATETIME) {
9294
if (!is_number(string_value)) {
9395
goto STRING;
9496
}
9597

96-
if (strlen(string_value) == 0) {
98+
if (string_value_length == 0) {
9799
data_to_null(zv_result_t);
98100

99101
return;
@@ -106,7 +108,7 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res
106108
}
107109

108110
if (Z_TYPE_P(zv_result_t) == IS_ARRAY) {
109-
add_next_index_long(zv_result_t, (zend_long)(value + 0.5));
111+
add_index_long(zv_result_t, zv_hashtable_index, (zend_long)(value + 0.5));
110112
} else {
111113
ZVAL_LONG(zv_result_t, (zend_long)(value + 0.5));
112114
}
@@ -119,14 +121,14 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res
119121
goto STRING;
120122
}
121123

122-
if (strlen(string_value) == 0) {
124+
if (string_value_length == 0) {
123125
data_to_null(zv_result_t);
124126

125127
return;
126128
}
127129

128130
if (Z_TYPE_P(zv_result_t) == IS_ARRAY) {
129-
add_next_index_double(zv_result_t, strtod(string_value, NULL));
131+
add_index_double(zv_result_t, zv_hashtable_index,strtod(string_value, NULL));
130132
} else {
131133
ZVAL_DOUBLE(zv_result_t, strtod(string_value, NULL));
132134
}
@@ -139,7 +141,7 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res
139141
goto STRING;
140142
}
141143

142-
if (strlen(string_value) == 0) {
144+
if (string_value_length == 0) {
143145
data_to_null(zv_result_t);
144146

145147
return;
@@ -150,7 +152,7 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res
150152
sscanf(string_value, ZEND_LONG_FMT, &_long_value);
151153

152154
if (Z_TYPE_P(zv_result_t) == IS_ARRAY) {
153-
add_next_index_long(zv_result_t, _long_value);
155+
add_index_long(zv_result_t, zv_hashtable_index, _long_value);
154156
} else {
155157
ZVAL_LONG(zv_result_t, _long_value);
156158
}
@@ -164,19 +166,19 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res
164166
zend_long _long = 0; double _double = 0;
165167

166168
if (!(type & READ_TYPE_STRING)) {
167-
is_numeric_string(string_value, strlen(string_value), &_long, &_double, 0);
169+
is_numeric_string(string_value, string_value_length, &_long, &_double, 0);
168170
}
169171

170172
if (Z_TYPE_P(zv_result_t) == IS_ARRAY) {
171173
if (_double > 0) {
172-
add_next_index_double(zv_result_t, _double);
174+
add_index_double(zv_result_t, zv_hashtable_index, _double);
173175
return;
174176
} else if (_long > 0) {
175-
add_next_index_long(zv_result_t, _long);
177+
add_index_long(zv_result_t, zv_hashtable_index, _long);
176178
return;
177179
}
178180

179-
add_next_index_stringl(zv_result_t, string_value, strlen(string_value));
181+
add_index_stringl(zv_result_t, zv_hashtable_index, string_value, string_value_length);
180182
return;
181183
}
182184

@@ -188,7 +190,7 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res
188190
return;
189191
}
190192

191-
ZVAL_STRINGL(zv_result_t, string_value, strlen(string_value));
193+
ZVAL_STRINGL(zv_result_t, string_value, string_value_length);
192194
}
193195
}
194196
/* }}} */
@@ -203,7 +205,8 @@ int sheet_read_row(xlsxioreadersheet sheet_t)
203205
/* {{{ */
204206
unsigned int load_sheet_current_row_data(xlsxioreadersheet sheet_t, zval *zv_result_t, zval *zv_type_arr_t, unsigned int flag)
205207
{
206-
zend_ulong _type, _cell_index = 0;
208+
zend_long _type, _cell_index = 0, _last_cell_index = 0;
209+
zend_bool _skip_empty_value_cell = 0;
207210
zend_array *_za_type_t = NULL;
208211
char *_string_value = NULL;
209212
zval *_current_type = NULL;
@@ -212,6 +215,10 @@ unsigned int load_sheet_current_row_data(xlsxioreadersheet sheet_t, zval *zv_res
212215
return XLSWRITER_FALSE;
213216
}
214217

218+
if (xlsxioread_sheet_flags(sheet_t) & SKIP_EMPTY_VALUE) {
219+
_skip_empty_value_cell = 1;
220+
}
221+
215222
if (Z_TYPE_P(zv_result_t) != IS_ARRAY) {
216223
array_init(zv_result_t);
217224
}
@@ -223,19 +230,33 @@ unsigned int load_sheet_current_row_data(xlsxioreadersheet sheet_t, zval *zv_res
223230
while ((_string_value = xlsxioread_sheet_next_cell(sheet_t)) != NULL)
224231
{
225232
_type = READ_TYPE_EMPTY;
233+
_last_cell_index = xlsxioread_sheet_last_column_index(sheet_t) - 1;
234+
235+
if (_last_cell_index < 0) {
236+
goto FREE_TMP_VALUE;
237+
}
238+
239+
if (_skip_empty_value_cell && strlen(_string_value) == 0) {
240+
goto FREE_TMP_VALUE;
241+
}
242+
243+
if (_last_cell_index > _cell_index) {
244+
_cell_index = _last_cell_index;
245+
}
226246

227247
if (_za_type_t != NULL) {
228248
if ((_current_type = zend_hash_index_find(_za_type_t, _cell_index)) != NULL) {
229249
if (Z_TYPE_P(_current_type) == IS_LONG) {
230250
_type = Z_LVAL_P(_current_type);
231251
}
232252
}
233-
234-
_cell_index++;
235253
}
236254

237-
data_to_custom_type(_string_value, _type, zv_result_t);
255+
data_to_custom_type(_string_value, _type, zv_result_t, _cell_index);
256+
257+
FREE_TMP_VALUE:
238258

259+
_cell_index++;
239260
free(_string_value);
240261
}
241262

@@ -322,7 +343,7 @@ int sheet_cell_callback (size_t row, size_t col, const char *value, void *callba
322343
}
323344
}
324345

325-
data_to_custom_type(value, _type, &args[2]);
346+
data_to_custom_type(value, _type, &args[2], 0);
326347
}
327348

328349
CALL_USER_FUNCTION:
@@ -337,7 +358,7 @@ int sheet_cell_callback (size_t row, size_t col, const char *value, void *callba
337358
/* }}} */
338359

339360
/* {{{ */
340-
unsigned int load_sheet_current_row_data_callback(zend_string *zs_sheet_name_t, xlsxioreader file_t, void *callback_data)
361+
unsigned int load_sheet_current_row_data_callback (zend_string *zs_sheet_name_t, xlsxioreader file_t, void *callback_data)
341362
{
342363
if (zs_sheet_name_t == NULL) {
343364
return xlsxioread_process(file_t, NULL, XLSXIOREAD_SKIP_NONE, sheet_cell_callback, sheet_row_callback, callback_data);
@@ -348,7 +369,7 @@ unsigned int load_sheet_current_row_data_callback(zend_string *zs_sheet_name_t,
348369
/* }}} */
349370

350371
/* {{{ */
351-
void load_sheet_all_data(xlsxioreadersheet sheet_t, zval *zv_type_t, zval *zv_result_t)
372+
void load_sheet_all_data (xlsxioreadersheet sheet_t, zval *zv_type_t, zval *zv_result_t)
352373
{
353374
if (Z_TYPE_P(zv_result_t) != IS_ARRAY) {
354375
array_init(zv_result_t);

0 commit comments

Comments
 (0)