Skip to content

Commit cc0bb65

Browse files
nikicnikic
committed
Reindent C files
1 parent 1463612 commit cc0bb65

File tree

257 files changed

+2912
-2912
lines changed

Some content is hidden

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

257 files changed

+2912
-2912
lines changed

‎TSRM/TSRM.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ TSRM_API void tsrm_shutdown(void)
254254
/* {{{ */
255255
/* environ lock api */
256256
TSRM_API void tsrm_env_lock() {
257-
tsrm_mutex_lock(tsrm_env_mutex);
257+
tsrm_mutex_lock(tsrm_env_mutex);
258258
}
259259

260260
TSRM_API void tsrm_env_unlock() {
261-
tsrm_mutex_unlock(tsrm_env_mutex);
261+
tsrm_mutex_unlock(tsrm_env_mutex);
262262
} /* }}} */
263263

264264
/* enlarge the arrays for the already active threads */
@@ -849,7 +849,7 @@ TSRM_API uint8_t tsrm_is_main_thread(void)
849849

850850
TSRM_API uint8_t tsrm_is_shutdown(void)
851851
{/*{{{*/
852-
return is_thread_shutdown;
852+
return is_thread_shutdown;
853853
}/*}}}*/
854854

855855
TSRM_API const char *tsrm_api_name(void)

‎Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,7 @@ ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properti
13211321

13221322
ZEND_API void object_properties_load(zend_object *object, HashTable *properties) /* {{{ */
13231323
{
1324-
zval *prop, tmp;
1324+
zval *prop, tmp;
13251325
zend_string *key;
13261326
zend_long h;
13271327
zend_property_info *property_info;

‎Zend/zend_API.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ typedef struct _zend_fcall_info_cache {
7979
#define ZEND_DEP_ME(classname, name, arg_info, flags) ZEND_ME(classname, name, arg_info, flags | ZEND_ACC_DEPRECATED)
8080
#define ZEND_ABSTRACT_ME(classname, name, arg_info) ZEND_FENTRY(name, NULL, arg_info, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
8181
#define ZEND_MALIAS(classname, name, alias, arg_info, flags) \
82-
ZEND_FENTRY(name, ZEND_MN(classname##_##alias), arg_info, flags)
82+
ZEND_FENTRY(name, ZEND_MN(classname##_##alias), arg_info, flags)
8383
#define ZEND_ME_MAPPING(name, func_name, arg_types, flags) ZEND_NAMED_ME(name, ZEND_FN(func_name), arg_types, flags)
8484

8585
#define ZEND_NS_FENTRY(ns, zend_name, name, arg_info, flags) ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, #zend_name), name, arg_info, flags)
@@ -146,9 +146,9 @@ typedef struct _zend_fcall_info_cache {
146146
#define ZEND_MODULE_GLOBALS_DTOR_D(module) void ZEND_MODULE_GLOBALS_DTOR_N(module)(zend_##module##_globals *module##_globals)
147147

148148
#define ZEND_GET_MODULE(name) \
149-
BEGIN_EXTERN_C()\
149+
BEGIN_EXTERN_C()\
150150
ZEND_DLEXPORT zend_module_entry *get_module(void) { return &name##_module_entry; }\
151-
END_EXTERN_C()
151+
END_EXTERN_C()
152152

153153
#define ZEND_BEGIN_MODULE_GLOBALS(module_name) \
154154
typedef struct _zend_##module_name##_globals {

‎Zend/zend_alloc.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static size_t _real_page_size = ZEND_MM_PAGE_SIZE;
128128
#endif
129129
#ifndef ZEND_MM_CUSTOM
130130
# define ZEND_MM_CUSTOM 1 /* support for custom memory allocator */
131-
/* USE_ZEND_ALLOC=0 may switch to system malloc() */
131+
/* USE_ZEND_ALLOC=0 may switch to system malloc() */
132132
#endif
133133
#ifndef ZEND_MM_STORAGE
134134
# define ZEND_MM_STORAGE 1 /* support for custom memory storage */
@@ -1157,7 +1157,7 @@ static zend_always_inline int zend_mm_small_size_to_bin(size_t size)
11571157
{
11581158
#if 0
11591159
int n;
1160-
/*0, 1, 2, 3, 4, 5, 6, 7, 8, 9 10, 11, 12*/
1160+
/*0, 1, 2, 3, 4, 5, 6, 7, 8, 9 10, 11, 12*/
11611161
static const int f1[] = { 3, 3, 3, 3, 3, 3, 3, 4, 5, 6, 7, 8, 9};
11621162
static const int f2[] = { 0, 0, 0, 0, 0, 0, 0, 4, 8, 12, 16, 20, 24};
11631163

@@ -1185,8 +1185,8 @@ static zend_always_inline int zend_mm_small_size_to_bin(size_t size)
11851185

11861186
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)
11871187
{
1188-
zend_mm_chunk *chunk;
1189-
int page_num;
1188+
zend_mm_chunk *chunk;
1189+
int page_num;
11901190
zend_mm_bin *bin;
11911191
zend_mm_free_slot *p, *end;
11921192

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

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

12821282
/********/
@@ -2014,7 +2014,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap)
20142014

20152015
static zend_long zend_mm_find_leaks_small(zend_mm_chunk *p, uint32_t i, uint32_t j, zend_leak_info *leak)
20162016
{
2017-
int empty = 1;
2017+
int empty = 1;
20182018
zend_long count = 0;
20192019
int bin_num = ZEND_MM_SRUN_BIN_NUM(p->map[i]);
20202020
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)));
@@ -2423,7 +2423,7 @@ static ZEND_COLD void ZEND_FASTCALL _efree_custom(void *ptr ZEND_FILE_LINE_DC ZE
24232423
AG(mm_heap)->custom_heap.debug._free(ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
24242424
} else {
24252425
AG(mm_heap)->custom_heap.std._free(ptr);
2426-
}
2426+
}
24272427
}
24282428

24292429
static ZEND_COLD void* ZEND_FASTCALL _realloc_custom(void *ptr, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
@@ -2812,9 +2812,9 @@ ZEND_API int zend_mm_is_custom_heap(zend_mm_heap *new_heap)
28122812
}
28132813

28142814
ZEND_API void zend_mm_set_custom_handlers(zend_mm_heap *heap,
2815-
void* (*_malloc)(size_t),
2816-
void (*_free)(void*),
2817-
void* (*_realloc)(void*, size_t))
2815+
void* (*_malloc)(size_t),
2816+
void (*_free)(void*),
2817+
void* (*_realloc)(void*, size_t))
28182818
{
28192819
#if ZEND_MM_CUSTOM
28202820
zend_mm_heap *_heap = (zend_mm_heap*)heap;
@@ -2831,9 +2831,9 @@ ZEND_API void zend_mm_set_custom_handlers(zend_mm_heap *heap,
28312831
}
28322832

28332833
ZEND_API void zend_mm_get_custom_handlers(zend_mm_heap *heap,
2834-
void* (**_malloc)(size_t),
2835-
void (**_free)(void*),
2836-
void* (**_realloc)(void*, size_t))
2834+
void* (**_malloc)(size_t),
2835+
void (**_free)(void*),
2836+
void* (**_realloc)(void*, size_t))
28372837
{
28382838
#if ZEND_MM_CUSTOM
28392839
zend_mm_heap *_heap = (zend_mm_heap*)heap;
@@ -2856,9 +2856,9 @@ ZEND_API void zend_mm_get_custom_handlers(zend_mm_heap *heap,
28562856

28572857
#if ZEND_DEBUG
28582858
ZEND_API void zend_mm_set_custom_debug_handlers(zend_mm_heap *heap,
2859-
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2860-
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2861-
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC))
2859+
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2860+
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
2861+
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC))
28622862
{
28632863
#if ZEND_MM_CUSTOM
28642864
zend_mm_heap *_heap = (zend_mm_heap*)heap;

‎Zend/zend_alloc.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -276,19 +276,19 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap);
276276

277277
ZEND_API int zend_mm_is_custom_heap(zend_mm_heap *new_heap);
278278
ZEND_API void zend_mm_set_custom_handlers(zend_mm_heap *heap,
279-
void* (*_malloc)(size_t),
280-
void (*_free)(void*),
281-
void* (*_realloc)(void*, size_t));
279+
void* (*_malloc)(size_t),
280+
void (*_free)(void*),
281+
void* (*_realloc)(void*, size_t));
282282
ZEND_API void zend_mm_get_custom_handlers(zend_mm_heap *heap,
283-
void* (**_malloc)(size_t),
284-
void (**_free)(void*),
285-
void* (**_realloc)(void*, size_t));
283+
void* (**_malloc)(size_t),
284+
void (**_free)(void*),
285+
void* (**_realloc)(void*, size_t));
286286

287287
#if ZEND_DEBUG
288288
ZEND_API void zend_mm_set_custom_debug_handlers(zend_mm_heap *heap,
289-
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
290-
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
291-
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC));
289+
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
290+
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
291+
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC));
292292
#endif
293293

294294
typedef struct _zend_mm_storage zend_mm_storage;

‎Zend/zend_ast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ static int zend_ast_add_unpacked_element(zval *result, zval *expr) {
451451
HashTable *ht = Z_ARRVAL_P(expr);
452452
zval *val;
453453
zend_string *key;
454-
454+
455455
ZEND_HASH_FOREACH_STR_KEY_VAL(ht, key, val) {
456456
if (key) {
457457
zend_throw_error(NULL, "Cannot unpack array with string keys");

‎Zend/zend_bitset.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,19 @@ static inline void zend_bitset_fill(zend_bitset set, uint32_t len)
120120

121121
static inline zend_bool zend_bitset_equal(zend_bitset set1, zend_bitset set2, uint32_t len)
122122
{
123-
return memcmp(set1, set2, len * ZEND_BITSET_ELM_SIZE) == 0;
123+
return memcmp(set1, set2, len * ZEND_BITSET_ELM_SIZE) == 0;
124124
}
125125

126126
static inline void zend_bitset_copy(zend_bitset set1, zend_bitset set2, uint32_t len)
127127
{
128-
memcpy(set1, set2, len * ZEND_BITSET_ELM_SIZE);
128+
memcpy(set1, set2, len * ZEND_BITSET_ELM_SIZE);
129129
}
130130

131131
static inline void zend_bitset_intersection(zend_bitset set1, zend_bitset set2, uint32_t len)
132132
{
133-
uint32_t i;
133+
uint32_t i;
134134

135-
for (i = 0; i < len; i++) {
135+
for (i = 0; i < len; i++) {
136136
set1[i] &= set2[i];
137137
}
138138
}

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,7 @@ ZEND_FUNCTION(get_defined_vars)
18671867
Creates an anonymous function, and returns its name (funny, eh?) */
18681868
ZEND_FUNCTION(create_function)
18691869
{
1870-
zend_string *function_name;
1870+
zend_string *function_name;
18711871
char *eval_code, *function_args, *function_code;
18721872
size_t eval_code_length, function_args_len, function_code_len;
18731873
int retval;

‎Zend/zend_compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ void zend_do_free(znode *op1) /* {{{ */
710710
} else {
711711
while (opline >= CG(active_op_array)->opcodes) {
712712
if ((opline->opcode == ZEND_FETCH_LIST_R ||
713-
opline->opcode == ZEND_FETCH_LIST_W) &&
713+
opline->opcode == ZEND_FETCH_LIST_W) &&
714714
opline->op1_type == IS_VAR &&
715715
opline->op1.var == op1->u.op.var) {
716716
zend_emit_op(NULL, ZEND_FREE, op1, NULL);

‎Zend/zend_compile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ void zend_class_add_ref(zval *zv);
808808

809809
ZEND_API zend_string *zend_mangle_property_name(const char *src1, size_t src1_length, const char *src2, size_t src2_length, int internal);
810810
#define zend_unmangle_property_name(mangled_property, class_name, prop_name) \
811-
zend_unmangle_property_name_ex(mangled_property, class_name, prop_name, NULL)
811+
zend_unmangle_property_name_ex(mangled_property, class_name, prop_name, NULL)
812812
ZEND_API int zend_unmangle_property_name_ex(const zend_string *name, const char **class_name, const char **prop_name, size_t *prop_len);
813813

814814
static zend_always_inline const char *zend_get_unmangled_property_name(const zend_string *mangled_prop) {

‎Zend/zend_constants.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ ZEND_API zval *zend_get_constant_str(const char *name, size_t name_len)
272272

273273
static inline zend_constant *zend_get_constant_impl(zend_string *name)
274274
{
275-
zval *zv;
275+
zval *zv;
276276
zend_constant *c;
277277
ALLOCA_FLAG(use_heap)
278278

‎Zend/zend_exceptions.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ZEND_API zend_class_entry *zend_get_exception_base(zval *object) /* {{{ */
7272

7373
void zend_exception_set_previous(zend_object *exception, zend_object *add_previous) /* {{{ */
7474
{
75-
zval *previous, *ancestor, *ex;
75+
zval *previous, *ancestor, *ex;
7676
zval pv, zv, rv;
7777
zend_class_entry *base_ce;
7878

@@ -379,9 +379,9 @@ ZEND_METHOD(error_exception, __construct)
379379
ZVAL_STR_COPY(&tmp, filename);
380380
zend_update_property_ex(zend_ce_exception, object, ZSTR_KNOWN(ZEND_STR_FILE), &tmp);
381381
zval_ptr_dtor(&tmp);
382-
if (argc < 5) {
383-
lineno = 0; /* invalidate lineno */
384-
}
382+
if (argc < 5) {
383+
lineno = 0; /* invalidate lineno */
384+
}
385385
ZVAL_LONG(&tmp, lineno);
386386
zend_update_property_ex(zend_ce_exception, object, ZSTR_KNOWN(ZEND_STR_LINE), &tmp);
387387
}

‎Zend/zend_execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3659,7 +3659,7 @@ ZEND_API void zend_init_func_execute_data(zend_execute_data *ex, zend_op_array *
36593659
i_init_func_execute_data(op_array, return_value, 1 EXECUTE_DATA_CC);
36603660

36613661
#if defined(ZEND_VM_IP_GLOBAL_REG) && ((ZEND_VM_KIND == ZEND_VM_KIND_CALL) || (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID))
3662-
EX(opline) = opline;
3662+
EX(opline) = opline;
36633663
opline = orig_opline;
36643664
#endif
36653665
#if defined(ZEND_VM_FP_GLOBAL_REG) && ((ZEND_VM_KIND == ZEND_VM_KIND_CALL) || (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID))

‎Zend/zend_execute_API.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(int dummy) /* {{{ */
11691169
static void zend_timeout_handler(int dummy) /* {{{ */
11701170
{
11711171
#ifndef ZTS
1172-
if (EG(timed_out)) {
1172+
if (EG(timed_out)) {
11731173
/* Die on hard timeout */
11741174
const char *error_filename = NULL;
11751175
uint32_t error_lineno = 0;
@@ -1197,7 +1197,7 @@ static void zend_timeout_handler(int dummy) /* {{{ */
11971197
zend_quiet_write(2, log_buffer, MIN(output_len, sizeof(log_buffer)));
11981198
}
11991199
_exit(124);
1200-
}
1200+
}
12011201
#endif
12021202

12031203
if (zend_on_timeout) {
@@ -1257,7 +1257,7 @@ static void zend_set_timeout_ex(zend_long seconds, int reset_signals) /* {{{ */
12571257
return;
12581258
}
12591259

1260-
/* Don't use ChangeTimerQueueTimer() as it will not restart an expired
1260+
/* Don't use ChangeTimerQueueTimer() as it will not restart an expired
12611261
timer, so we could end up with just an ignored timeout. Instead
12621262
delete and recreate. */
12631263
if (NULL != tq_timer) {
@@ -1453,7 +1453,7 @@ zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string
14531453

14541454
ZEND_API int zend_delete_global_variable(zend_string *name) /* {{{ */
14551455
{
1456-
return zend_hash_del_ind(&EG(symbol_table), name);
1456+
return zend_hash_del_ind(&EG(symbol_table), name);
14571457
}
14581458
/* }}} */
14591459

0 commit comments

Comments
 (0)