Skip to content

Commit 671fff2

Browse files
author
Andi Gutmans
committed
h WHitespace
1 parent 3429e33 commit 671fff2

12 files changed

+31
-31
lines changed

‎Zend/zend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ ZEND_API void zend_print_zval_r(zval *expr, int indent)
225225

226226
ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent)
227227
{
228-
switch(expr->type) {
228+
switch (expr->type) {
229229
case IS_ARRAY:
230230
ZEND_PUTS("Array\n");
231231
if (++expr->value.ht->nApplyCount>1) {

‎Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ int module_registry_request_startup(zend_module_entry *module TSRMLS_DC)
11741174
*/
11751175
int module_registry_cleanup(zend_module_entry *module TSRMLS_DC)
11761176
{
1177-
switch(module->type) {
1177+
switch (module->type) {
11781178
case MODULE_PERSISTENT:
11791179
if (module->request_shutdown_func) {
11801180
#if 0

‎Zend/zend_builtin_functions.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ ZEND_FUNCTION(define)
433433
int case_sensitive;
434434
zend_constant c;
435435

436-
switch(ZEND_NUM_ARGS()) {
436+
switch (ZEND_NUM_ARGS()) {
437437
case 2:
438438
if (zend_get_parameters_ex(2, &var, &val)==FAILURE) {
439439
RETURN_FALSE;
@@ -456,7 +456,7 @@ ZEND_FUNCTION(define)
456456
break;
457457
}
458458

459-
switch((*val)->type) {
459+
switch ((*val)->type) {
460460
case IS_LONG:
461461
case IS_DOUBLE:
462462
case IS_STRING:
@@ -897,7 +897,7 @@ ZEND_FUNCTION(trigger_error)
897897
int error_type = E_USER_NOTICE;
898898
zval **z_error_type, **z_error_message;
899899

900-
switch(ZEND_NUM_ARGS()) {
900+
switch (ZEND_NUM_ARGS()) {
901901
case 1:
902902
if (zend_get_parameters_ex(1, &z_error_message)==FAILURE) {
903903
ZEND_WRONG_PARAM_COUNT();

‎Zend/zend_compile.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *o
208208

209209
if (last_op->opcode == ZEND_FETCH_OBJ_RW) {
210210

211-
switch(op) {
211+
switch (op) {
212212
case ZEND_ASSIGN_ADD:
213213
opline->opcode = ZEND_ASSIGN_ADD_OBJ;
214214
break;
@@ -287,10 +287,10 @@ void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar
287287

288288
opline_ptr->op2.u.EA.type = ZEND_FETCH_LOCAL;
289289
if (varname->op_type == IS_CONST && varname->u.constant.type == IS_STRING) {
290-
if(zend_hash_exists(CG(auto_globals), varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) {
290+
if (zend_hash_exists(CG(auto_globals), varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) {
291291
opline_ptr->op2.u.EA.type = ZEND_FETCH_GLOBAL;
292292
} else {
293-
if(CG(active_op_array)->static_variables && zend_hash_exists(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) {
293+
if (CG(active_op_array)->static_variables && zend_hash_exists(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1)) {
294294
opline_ptr->op2.u.EA.type = ZEND_FETCH_STATIC;
295295
}
296296
}
@@ -1304,7 +1304,7 @@ void zend_do_pass_param(znode *param, zend_uchar op, int offset TSRMLS_DC)
13041304
}
13051305

13061306
if (original_op == ZEND_SEND_VAR) {
1307-
switch(op) {
1307+
switch (op) {
13081308
case ZEND_SEND_VAR_NO_REF:
13091309
zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC);
13101310
break;
@@ -2222,7 +2222,7 @@ void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS
22222222
SET_UNUSED(opline_ptr->op1); /* this means $this for objects */
22232223
opline_ptr->op2 = *property;
22242224
/* if it was usual fetch, we change it to object fetch */
2225-
switch(opline_ptr->opcode) {
2225+
switch (opline_ptr->opcode) {
22262226
case ZEND_FETCH_W:
22272227
opline_ptr->opcode = ZEND_FETCH_OBJ_W;
22282228
break;
@@ -2550,7 +2550,7 @@ void zend_do_list_end(znode *result, znode *expr TSRMLS_DC)
25502550
opline = get_next_op(CG(active_op_array) TSRMLS_CC);
25512551
if (dimension == tmp_dimension_llist->head) { /* first */
25522552
last_container = *expr;
2553-
switch(expr->op_type) {
2553+
switch (expr->op_type) {
25542554
case IS_VAR:
25552555
opline->opcode = ZEND_FETCH_DIM_R;
25562556
break;
@@ -2606,7 +2606,7 @@ void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int
26062606

26072607
ALLOC_ZVAL(tmp);
26082608
convert_to_string(&varname->u.constant);
2609-
if(static_assignment) {
2609+
if (static_assignment) {
26102610
*tmp = static_assignment->u.constant;
26112611
} else {
26122612
INIT_ZVAL(*tmp);
@@ -3090,7 +3090,7 @@ int zendlex(znode *zendlval TSRMLS_DC)
30903090

30913091
zendlval->u.constant.type = IS_LONG;
30923092
retval = lex_scan(&zendlval->u.constant TSRMLS_CC);
3093-
switch(retval) {
3093+
switch (retval) {
30943094
case T_COMMENT:
30953095
case T_OPEN_TAG:
30963096
case T_WHITESPACE:

‎Zend/zend_execute.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static void zend_extension_fcall_end_handler(zend_extension *extension, zend_op_
5252

5353
static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, zval **should_free TSRMLS_DC)
5454
{
55-
switch(node->op_type) {
55+
switch (node->op_type) {
5656
case IS_CONST:
5757
*should_free = 0;
5858
return &node->u.constant;
@@ -243,8 +243,8 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC)
243243

244244
static inline zval **get_obj_zval_ptr_ptr(znode *op, temp_variable *Ts, int type TSRMLS_DC)
245245
{
246-
if(op->op_type == IS_UNUSED) {
247-
if(EG(This)) {
246+
if (op->op_type == IS_UNUSED) {
247+
if (EG(This)) {
248248
/* this should actually never be modified, _ptr_ptr is modified only when
249249
the object is empty */
250250
return &EG(This);
@@ -257,8 +257,8 @@ static inline zval **get_obj_zval_ptr_ptr(znode *op, temp_variable *Ts, int type
257257

258258
static inline zval *get_obj_zval_ptr(znode *op, temp_variable *Ts, zval **freeop, int type TSRMLS_DC)
259259
{
260-
if(op->op_type == IS_UNUSED) {
261-
if(EG(This)) {
260+
if (op->op_type == IS_UNUSED) {
261+
if (EG(This)) {
262262
return EG(This);
263263
} else {
264264
zend_error(E_ERROR, "Using $this when not in object context");
@@ -624,7 +624,7 @@ static inline HashTable *zend_get_target_symbol_table(zend_op *opline, temp_vari
624624
return EG(active_op_array)->static_variables;
625625
break;
626626
case ZEND_FETCH_STATIC_MEMBER:
627-
if(T(opline->op2.u.var).EA.class_entry->parent) {
627+
if (T(opline->op2.u.var).EA.class_entry->parent) {
628628
/* if inherited, try to look up */
629629
return zend_find_inherited_static(T(opline->op2.u.var).EA.class_entry, variable);
630630
} else {
@@ -784,7 +784,7 @@ static void zend_fetch_dimension_address(znode *result, znode *op1, znode *op2,
784784
zval ***retval = &T(result->u.var).var.ptr_ptr;
785785

786786
if (!container_ptr) {
787-
if(T(op1->u.var).EA.type == IS_STRING_OFFSET) {
787+
if (T(op1->u.var).EA.type == IS_STRING_OFFSET) {
788788
zval *offset;
789789
zend_error(E_WARNING, "Cannot use string offset as an array");
790790

@@ -1828,7 +1828,7 @@ int zend_make_var_handler(ZEND_OPCODE_HANDLER_ARGS)
18281828
zval *value, *value2;
18291829

18301830
value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R);
1831-
switch(EX(opline)->op1.op_type) {
1831+
switch (EX(opline)->op1.op_type) {
18321832
case IS_TMP_VAR:
18331833
value2 = value;
18341834
ALLOC_ZVAL(value);
@@ -3030,7 +3030,7 @@ inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS)
30303030
}
30313031
}
30323032
if (offset) {
3033-
switch(offset->type) {
3033+
switch (offset->type) {
30343034
case IS_DOUBLE:
30353035
zend_hash_index_update(array_ptr->value.ht, (long) offset->value.dval, &expr_ptr, sizeof(zval *), NULL);
30363036
break;

‎Zend/zend_execute_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ ZEND_API char *get_active_function_name(TSRMLS_D)
260260
if (!zend_is_executing(TSRMLS_C)) {
261261
return NULL;
262262
}
263-
switch(EG(function_state_ptr)->function->type) {
263+
switch (EG(function_state_ptr)->function->type) {
264264
case ZEND_USER_FUNCTION: {
265265
char *function_name = ((zend_op_array *) EG(function_state_ptr)->function)->function_name;
266266

‎Zend/zend_indent.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ZEND_API void zend_indent()
8080
default:
8181
if (token.type==0) {
8282
/* keyword */
83-
switch(token_type) {
83+
switch (token_type) {
8484
case ',':
8585
ZEND_PUTS(", ");
8686
goto dflt_printout;

‎Zend/zend_object_handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
207207
}
208208

209209
if (zend_hash_find(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &variable_ptr) == SUCCESS) {
210-
if(*variable_ptr == value) {
210+
if (*variable_ptr == value) {
211211
/* if we already have this value there, we don't actually need to do anything */
212212
setter_done = 1;
213213
} else {

‎Zend/zend_opcode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ int print_class(zend_class_entry *class_entry TSRMLS_DC)
339339

340340
ZEND_API unary_op_type get_unary_op(int opcode)
341341
{
342-
switch(opcode) {
342+
switch (opcode) {
343343
case ZEND_BW_NOT:
344344
return (unary_op_type) bitwise_not_function;
345345
break;

‎Zend/zend_operators.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ ZEND_API void convert_to_array(zval *op)
504504
{
505505
TSRMLS_FETCH();
506506

507-
switch(op->type) {
507+
switch (op->type) {
508508
case IS_ARRAY:
509509
return;
510510
break;
@@ -538,7 +538,7 @@ ZEND_API void convert_to_array(zval *op)
538538

539539
ZEND_API void convert_to_object(zval *op)
540540
{
541-
switch(op->type) {
541+
switch (op->type) {
542542
case IS_ARRAY:
543543
{
544544
/* OBJECTS_OPTIMIZE */
@@ -1540,7 +1540,7 @@ ZEND_API int decrement_function(zval *op1)
15401540
op1->type = IS_LONG;
15411541
break;
15421542
}
1543-
switch(is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0)) {
1543+
switch (is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0)) {
15441544
case IS_LONG:
15451545
STR_FREE(op1->value.str.val);
15461546
if (lval == LONG_MIN) {

‎Zend/zend_operators.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static inline zend_bool is_numeric_string(char *str, int length, long *lval, dou
109109
register char *ptr=str, *end=str+length;
110110

111111
while (ptr<end) {
112-
switch(*ptr++) {
112+
switch (*ptr++) {
113113
case 'e':
114114
case 'E':
115115
/* scientific notation, not handled by the BC library */

‎Zend/zend_variables.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
3737
if (zvalue->type==IS_LONG) {
3838
return;
3939
}
40-
switch(zvalue->type & ~IS_CONSTANT_INDEX) {
40+
switch (zvalue->type & ~IS_CONSTANT_INDEX) {
4141
case IS_STRING:
4242
case IS_CONSTANT:
4343
CHECK_ZVAL_STRING_REL(zvalue);

0 commit comments

Comments
 (0)