Skip to content

Commit aff3658

Browse files
patrickallaertpatrickallaert
committed
Fixed some spaces used instead of tabs
1 parent a233bfc commit aff3658

File tree

157 files changed

+1026
-1029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+1026
-1029
lines changed

‎TSRM/TSRM.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@ TSRM_API void tsrm_shutdown(void)
229229
/* {{{ */
230230
/* environ lock api */
231231
TSRM_API void tsrm_env_lock(void) {
232-
tsrm_mutex_lock(tsrm_env_mutex);
232+
tsrm_mutex_lock(tsrm_env_mutex);
233233
}
234234

235235
TSRM_API void tsrm_env_unlock(void) {
236-
tsrm_mutex_unlock(tsrm_env_mutex);
236+
tsrm_mutex_unlock(tsrm_env_mutex);
237237
} /* }}} */
238238

239239
/* enlarge the arrays for the already active threads */
@@ -768,7 +768,7 @@ TSRM_API uint8_t tsrm_is_main_thread(void)
768768

769769
TSRM_API uint8_t tsrm_is_shutdown(void)
770770
{/*{{{*/
771-
return is_thread_shutdown;
771+
return is_thread_shutdown;
772772
}/*}}}*/
773773

774774
TSRM_API const char *tsrm_api_name(void)

‎Zend/Optimizer/escape_analysis.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static int is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, in
188188
}
189189
break;
190190
}
191-
} else if (ssa_op->op1_def == var) {
191+
} else if (ssa_op->op1_def == var) {
192192
switch (opline->opcode) {
193193
case ZEND_ASSIGN:
194194
if (opline->op2_type == IS_CONST
@@ -208,7 +208,7 @@ static int is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, in
208208
}
209209
}
210210

211-
return 0;
211+
return 0;
212212
}
213213
/* }}} */
214214

‎Zend/Optimizer/optimize_temp_vars_5.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_c
5959
valid_T = (zend_bitset) zend_arena_alloc(&ctx->arena, bitset_len * ZEND_BITSET_ELM_SIZE);
6060
map_T = (int *) zend_arena_alloc(&ctx->arena, T * sizeof(int));
6161

62-
end = op_array->opcodes;
63-
opline = &op_array->opcodes[op_array->last - 1];
62+
end = op_array->opcodes;
63+
opline = &op_array->opcodes[op_array->last - 1];
6464

65-
/* Find T definition points */
66-
while (opline >= end) {
67-
if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
65+
/* Find T definition points */
66+
while (opline >= end) {
67+
if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
6868
start_of_T[VAR_NUM(opline->result.var) - offset] = opline;
6969
}
7070
opline--;
@@ -73,10 +73,10 @@ void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_c
7373
zend_bitset_clear(valid_T, bitset_len);
7474
zend_bitset_clear(taken_T, bitset_len);
7575

76-
end = op_array->opcodes;
77-
opline = &op_array->opcodes[op_array->last - 1];
76+
end = op_array->opcodes;
77+
opline = &op_array->opcodes[op_array->last - 1];
7878

79-
while (opline >= end) {
79+
while (opline >= end) {
8080
if ((opline->op1_type & (IS_VAR | IS_TMP_VAR))) {
8181
currT = VAR_NUM(opline->op1.var) - offset;
8282
if (opline->opcode == ZEND_ROPE_END) {

‎Zend/Optimizer/zend_call_graph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static void zend_op_array_calc(zend_op_array *op_array, void *context)
3535
static void zend_op_array_collect(zend_op_array *op_array, void *context)
3636
{
3737
zend_call_graph *call_graph = context;
38-
zend_func_info *func_info = call_graph->func_infos + call_graph->op_arrays_count;
38+
zend_func_info *func_info = call_graph->func_infos + call_graph->op_arrays_count;
3939

4040
ZEND_SET_FUNC_INFO(op_array, func_info);
4141
call_graph->op_arrays[call_graph->op_arrays_count] = op_array;

‎Zend/Optimizer/zend_inference.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3285,7 +3285,7 @@ static zend_always_inline int _zend_update_type_info(
32853285
if (opline->opcode == ZEND_FETCH_DIM_W ||
32863286
opline->opcode == ZEND_FETCH_DIM_RW ||
32873287
opline->opcode == ZEND_FETCH_DIM_FUNC_ARG ||
3288-
opline->opcode == ZEND_FETCH_LIST_W) {
3288+
opline->opcode == ZEND_FETCH_LIST_W) {
32893289
if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
32903290
if (opline->opcode != ZEND_FETCH_DIM_FUNC_ARG) {
32913291
tmp &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE);

‎Zend/Optimizer/zend_optimizer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ int zend_optimizer_replace_by_const(zend_op_array *op_array,
645645
ZEND_ASSERT(opline->op1.var == var);
646646

647647
break;
648-
}
648+
}
649649
default:
650650
break;
651651
}

‎Zend/zend.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ ZEND_INI_BEGIN()
196196
ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting)
197197
STD_ZEND_INI_ENTRY("zend.assertions", "1", ZEND_INI_ALL, OnUpdateAssertions, assertions, zend_executor_globals, executor_globals)
198198
ZEND_INI_ENTRY3_EX("zend.enable_gc", "1", ZEND_INI_ALL, OnUpdateGCEnabled, NULL, NULL, NULL, zend_gc_enabled_displayer_cb)
199-
STD_ZEND_INI_BOOLEAN("zend.multibyte", "0", ZEND_INI_PERDIR, OnUpdateBool, multibyte, zend_compiler_globals, compiler_globals)
200-
ZEND_INI_ENTRY("zend.script_encoding", NULL, ZEND_INI_ALL, OnUpdateScriptEncoding)
201-
STD_ZEND_INI_BOOLEAN("zend.detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
199+
STD_ZEND_INI_BOOLEAN("zend.multibyte", "0", ZEND_INI_PERDIR, OnUpdateBool, multibyte, zend_compiler_globals, compiler_globals)
200+
ZEND_INI_ENTRY("zend.script_encoding", NULL, ZEND_INI_ALL, OnUpdateScriptEncoding)
201+
STD_ZEND_INI_BOOLEAN("zend.detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
202202
#ifdef ZEND_SIGNALS
203203
STD_ZEND_INI_BOOLEAN("zend.signal_check", SIGNAL_CHECK_DEFAULT, ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
204204
#endif

‎Zend/zend_API.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ static ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_entr
377377
zend_throw_error(error_ce, "%s(): Argument #%d%s%s%s %s",
378378
ZSTR_VAL(func_name), arg_num,
379379
arg_name ? " ($" : "", arg_name ? arg_name : "", arg_name ? ")" : "", message
380-
);
380+
);
381381
efree(message);
382382
zend_string_release(func_name);
383383
}
@@ -1548,12 +1548,12 @@ ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properti
15481548

15491549
ZEND_API void object_properties_load(zend_object *object, HashTable *properties) /* {{{ */
15501550
{
1551-
zval *prop, tmp;
1552-
zend_string *key;
1553-
zend_long h;
1554-
zend_property_info *property_info;
1551+
zval *prop, tmp;
1552+
zend_string *key;
1553+
zend_long h;
1554+
zend_property_info *property_info;
15551555

1556-
ZEND_HASH_FOREACH_KEY_VAL(properties, h, key, prop) {
1556+
ZEND_HASH_FOREACH_KEY_VAL(properties, h, key, prop) {
15571557
if (key) {
15581558
if (ZSTR_VAL(key)[0] == '\0') {
15591559
const char *class_name, *prop_name;

‎Zend/zend_alloc.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -323,17 +323,17 @@ struct _zend_mm_huge_list {
323323

324324
#define _BIN_DATA_SIZE(num, size, elements, pages, x, y) size,
325325
static const uint32_t bin_data_size[] = {
326-
ZEND_MM_BINS_INFO(_BIN_DATA_SIZE, x, y)
326+
ZEND_MM_BINS_INFO(_BIN_DATA_SIZE, x, y)
327327
};
328328

329329
#define _BIN_DATA_ELEMENTS(num, size, elements, pages, x, y) elements,
330330
static const uint32_t bin_elements[] = {
331-
ZEND_MM_BINS_INFO(_BIN_DATA_ELEMENTS, x, y)
331+
ZEND_MM_BINS_INFO(_BIN_DATA_ELEMENTS, x, y)
332332
};
333333

334334
#define _BIN_DATA_PAGES(num, size, elements, pages, x, y) pages,
335335
static const uint32_t bin_pages[] = {
336-
ZEND_MM_BINS_INFO(_BIN_DATA_PAGES, x, y)
336+
ZEND_MM_BINS_INFO(_BIN_DATA_PAGES, x, y)
337337
};
338338

339339
#if ZEND_DEBUG
@@ -1186,8 +1186,8 @@ static zend_always_inline int zend_mm_small_size_to_bin(size_t size)
11861186

11871187
static zend_never_inline void *zend_mm_alloc_small_slow(zend_mm_heap *heap, uint32_t bin_num ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
11881188
{
1189-
zend_mm_chunk *chunk;
1190-
int page_num;
1189+
zend_mm_chunk *chunk;
1190+
int page_num;
11911191
zend_mm_bin *bin;
11921192
zend_mm_free_slot *p, *end;
11931193

@@ -1275,9 +1275,9 @@ static zend_always_inline void zend_mm_free_small(zend_mm_heap *heap, void *ptr,
12751275
} while (0);
12761276
#endif
12771277

1278-
p = (zend_mm_free_slot*)ptr;
1279-
p->next_free_slot = heap->free_slot[bin_num];
1280-
heap->free_slot[bin_num] = p;
1278+
p = (zend_mm_free_slot*)ptr;
1279+
p->next_free_slot = heap->free_slot[bin_num];
1280+
heap->free_slot[bin_num] = p;
12811281
}
12821282

12831283
/********/
@@ -2015,7 +2015,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap)
20152015

20162016
static zend_long zend_mm_find_leaks_small(zend_mm_chunk *p, uint32_t i, uint32_t j, zend_leak_info *leak)
20172017
{
2018-
int empty = 1;
2018+
int empty = 1;
20192019
zend_long count = 0;
20202020
int bin_num = ZEND_MM_SRUN_BIN_NUM(p->map[i]);
20212021
zend_mm_debug_info *dbg = (zend_mm_debug_info*)((char*)p + ZEND_MM_PAGE_SIZE * i + bin_data_size[bin_num] * (j + 1) - ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_debug_info)));
@@ -2426,7 +2426,7 @@ static ZEND_COLD void ZEND_FASTCALL _efree_custom(void *ptr ZEND_FILE_LINE_DC ZE
24262426
AG(mm_heap)->custom_heap.debug._free(ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
24272427
} else {
24282428
AG(mm_heap)->custom_heap.std._free(ptr);
2429-
}
2429+
}
24302430
}
24312431

24322432
static ZEND_COLD void* ZEND_FASTCALL _realloc_custom(void *ptr, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
@@ -2924,9 +2924,9 @@ ZEND_API void zend_mm_get_custom_handlers(zend_mm_heap *heap,
29242924

29252925
#if ZEND_DEBUG
29262926
ZEND_API void zend_mm_set_custom_debug_handlers(zend_mm_heap *heap,
2927-
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2928-
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2929-
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC))
2927+
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2928+
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2929+
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC))
29302930
{
29312931
#if ZEND_MM_CUSTOM
29322932
zend_mm_heap *_heap = (zend_mm_heap*)heap;

‎Zend/zend_ast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ static zend_result zend_ast_add_array_element(zval *result, zval *offset, zval *
474474
default:
475475
zend_type_error("Illegal offset type");
476476
return FAILURE;
477-
}
477+
}
478478
return SUCCESS;
479479
}
480480

0 commit comments

Comments
 (0)