Skip to content

Commit c0404f4

Browse files
zsuraskizsuraski
committed
Whitespace
1 parent f6f6c4d commit c0404f4

Some content is hidden

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

46 files changed

+708
-707
lines changed

‎ext/ereg/ereg.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void _free_reg_cache(reg_cache *rc)
8282
#undef regfree
8383
#define regfree(a);
8484
#undef regcomp
85-
#define regcomp(a,b,c) _php_regcomp(a,b,c)
85+
#define regcomp(a, b, c) _php_regcomp(a, b, c)
8686

8787
static void php_reg_init_globals(php_reg_globals *reg_globals TSRMLS_DC)
8888
{
@@ -440,7 +440,7 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
440440

441441
if ((*arg_pattern)->type == IS_STRING) {
442442
if ((*arg_pattern)->value.str.val && (*arg_pattern)->value.str.len)
443-
pattern = estrndup((*arg_pattern)->value.str.val,(*arg_pattern)->value.str.len);
443+
pattern = estrndup((*arg_pattern)->value.str.val, (*arg_pattern)->value.str.len);
444444
else
445445
pattern = empty_string;
446446
} else {
@@ -473,7 +473,7 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
473473
if (ret == (char *) -1) {
474474
RETVAL_FALSE;
475475
} else {
476-
RETVAL_STRING(ret,1);
476+
RETVAL_STRING(ret, 1);
477477
STR_FREE(ret);
478478
}
479479
STR_FREE(string);

‎ext/standard/array.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static int array_key_compare(const void *a, const void *b)
171171

172172
static int array_reverse_key_compare(const void *a, const void *b)
173173
{
174-
return array_key_compare(a,b)*-1;
174+
return array_key_compare(a, b)*-1;
175175
}
176176

177177
/* {{{ proto int krsort(array array_arg [, int sort_flags])
@@ -225,7 +225,7 @@ PHP_FUNCTION(ksort)
225225
sort_type_val = Z_LVAL_PP(sort_type);
226226
}
227227
set_compare_func(sort_type_val TSRMLS_CC);
228-
if (zend_hash_sort(target_hash, qsort, array_key_compare,0) == FAILURE) {
228+
if (zend_hash_sort(target_hash, qsort, array_key_compare, 0) == FAILURE) {
229229
return;
230230
}
231231
RETURN_TRUE;
@@ -303,7 +303,7 @@ static int array_data_compare(const void *a, const void *b)
303303

304304
static int array_reverse_data_compare(const void *a, const void *b)
305305
{
306-
return array_data_compare(a,b)*-1;
306+
return array_data_compare(a, b)*-1;
307307
}
308308

309309
static int array_natural_general_compare(const void *a, const void *b, int fold_case)
@@ -420,7 +420,7 @@ PHP_FUNCTION(asort)
420420
sort_type_val = Z_LVAL_PP(sort_type);
421421
}
422422
set_compare_func(sort_type_val TSRMLS_CC);
423-
if (zend_hash_sort(target_hash, qsort, array_data_compare,0) == FAILURE) {
423+
if (zend_hash_sort(target_hash, qsort, array_data_compare, 0) == FAILURE) {
424424
return;
425425
}
426426
RETURN_TRUE;
@@ -449,7 +449,7 @@ PHP_FUNCTION(arsort)
449449
sort_type_val = Z_LVAL_PP(sort_type);
450450
}
451451
set_compare_func(sort_type_val TSRMLS_CC);
452-
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,0) == FAILURE) {
452+
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare, 0) == FAILURE) {
453453
RETURN_FALSE;
454454
}
455455
RETURN_TRUE;
@@ -478,7 +478,7 @@ PHP_FUNCTION(sort)
478478
sort_type_val = Z_LVAL_PP(sort_type);
479479
}
480480
set_compare_func(sort_type_val TSRMLS_CC);
481-
if (zend_hash_sort(target_hash, qsort, array_data_compare,1) == FAILURE) {
481+
if (zend_hash_sort(target_hash, qsort, array_data_compare, 1) == FAILURE) {
482482
RETURN_FALSE;
483483
}
484484
RETURN_TRUE;
@@ -507,7 +507,7 @@ PHP_FUNCTION(rsort)
507507
sort_type_val = Z_LVAL_PP(sort_type);
508508
}
509509
set_compare_func(sort_type_val TSRMLS_CC);
510-
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,1) == FAILURE) {
510+
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare, 1) == FAILURE) {
511511
RETURN_FALSE;
512512
}
513513
RETURN_TRUE;
@@ -979,7 +979,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata TSRMLS_DC)
979979

980980
zval_ptr_dtor(&retval_ptr);
981981
} else
982-
php_error(E_WARNING,"Unable to call %s() - function does not exist",
982+
php_error(E_WARNING, "Unable to call %s() - function does not exist",
983983
(*BG(array_walk_func_name))->value.str.val);
984984

985985
zend_hash_move_forward_ex(target_hash, &pos);
@@ -1331,7 +1331,7 @@ PHP_FUNCTION(range)
13311331
{
13321332
zval **zlow, **zhigh;
13331333

1334-
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2,&zlow,&zhigh) == FAILURE) {
1334+
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &zlow, &zhigh) == FAILURE) {
13351335
WRONG_PARAM_COUNT;
13361336
}
13371337

@@ -2039,7 +2039,7 @@ PHP_FUNCTION(array_count_values)
20392039
MAKE_STD_ZVAL(data);
20402040
Z_TYPE_P(data) = IS_LONG;
20412041
Z_LVAL_P(data) = 1;
2042-
zend_hash_index_update(Z_ARRVAL_P(return_value),Z_LVAL_PP(entry), &data, sizeof(data), NULL);
2042+
zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_PP(entry), &data, sizeof(data), NULL);
20432043
} else {
20442044
Z_LVAL_PP(tmp)++;
20452045
}
@@ -2052,7 +2052,7 @@ PHP_FUNCTION(array_count_values)
20522052
MAKE_STD_ZVAL(data);
20532053
Z_TYPE_P(data) = IS_LONG;
20542054
Z_LVAL_P(data) = 1;
2055-
zend_hash_update(Z_ARRVAL_P(return_value),Z_STRVAL_PP(entry),Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
2055+
zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
20562056
} else {
20572057
Z_LVAL_PP(tmp)++;
20582058
}
@@ -2227,9 +2227,9 @@ PHP_FUNCTION(array_flip)
22272227
}
22282228

22292229
if (Z_TYPE_PP(entry) == IS_LONG) {
2230-
zend_hash_index_update(Z_ARRVAL_P(return_value),Z_LVAL_PP(entry), &data, sizeof(data), NULL);
2230+
zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_PP(entry), &data, sizeof(data), NULL);
22312231
} else if (Z_TYPE_PP(entry) == IS_STRING) {
2232-
zend_hash_update(Z_ARRVAL_P(return_value),Z_STRVAL_PP(entry),Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
2232+
zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
22332233
} else {
22342234
zval_ptr_dtor(&data); /* will free also zval structure */
22352235
php_error(E_WARNING, "Can only flip STRING and INTEGER values!");

‎ext/standard/assert.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static PHP_INI_MH(OnChangeCallback)
5959
MAKE_STD_ZVAL(ASSERTG(callback));
6060

6161
if (new_value) {
62-
ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1);
62+
ZVAL_STRINGL(ASSERTG(callback), new_value, new_value_length, 1);
6363
} else {
6464
ZVAL_EMPTY_STRING(ASSERTG(callback));
6565
}
@@ -188,9 +188,9 @@ PHP_FUNCTION(assert)
188188
MAKE_STD_ZVAL(args[1]);
189189
MAKE_STD_ZVAL(args[2]);
190190

191-
ZVAL_STRING(args[0],SAFE_STRING(filename),1);
192-
ZVAL_LONG (args[1],lineno);
193-
ZVAL_STRING(args[2],SAFE_STRING(myeval),1);
191+
ZVAL_STRING(args[0], SAFE_STRING(filename), 1);
192+
ZVAL_LONG (args[1], lineno);
193+
ZVAL_STRING(args[2], SAFE_STRING(myeval), 1);
194194

195195
MAKE_STD_ZVAL(retval);
196196
ZVAL_FALSE(retval);
@@ -206,9 +206,9 @@ PHP_FUNCTION(assert)
206206

207207
if (ASSERTG(warning)) {
208208
if (myeval) {
209-
php_error(E_WARNING,"Assertion \"%s\" failed",myeval);
209+
php_error(E_WARNING, "Assertion \"%s\" failed", myeval);
210210
} else {
211-
php_error(E_WARNING,"Assertion failed");
211+
php_error(E_WARNING, "Assertion failed");
212212
}
213213
}
214214

@@ -223,7 +223,7 @@ PHP_FUNCTION(assert)
223223

224224
PHP_FUNCTION(assert_options)
225225
{
226-
pval **what,**value;
226+
pval **what, **value;
227227
int oldint;
228228
int ac = ZEND_NUM_ARGS();
229229

@@ -282,7 +282,7 @@ PHP_FUNCTION(assert_options)
282282
break;
283283

284284
default:
285-
php_error(E_WARNING,"Unknown value %d.",Z_LVAL_PP(what));
285+
php_error(E_WARNING, "Unknown value %d.", Z_LVAL_PP(what));
286286
break;
287287
}
288288

‎ext/standard/base64.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ PHP_FUNCTION(base64_encode)
157157
unsigned char *result;
158158
int ret_length;
159159

160-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1,&str) == FAILURE) {
160+
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &str) == FAILURE) {
161161
WRONG_PARAM_COUNT;
162162
}
163163
convert_to_string_ex(str);
@@ -179,7 +179,7 @@ PHP_FUNCTION(base64_decode)
179179
unsigned char *result;
180180
int ret_length;
181181

182-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1,&str) == FAILURE) {
182+
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &str) == FAILURE) {
183183
WRONG_PARAM_COUNT;
184184
}
185185
convert_to_string_ex(str);

0 commit comments

Comments
 (0)