Skip to content

Commit

Permalink
Whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@zsuraski
zsuraski committed Aug 11, 2001
1 parent f6f6c4d commit c0404f4
Show file tree
Hide file tree
Showing 46 changed files with 708 additions and 707 deletions.
6 changes: 3 additions & 3 deletions ext/ereg/ereg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static void _free_reg_cache(reg_cache *rc)
#undef regfree
#define regfree(a);
#undef regcomp
#define regcomp(a,b,c) _php_regcomp(a,b,c)
#define regcomp(a, b, c) _php_regcomp(a, b, c)

static void php_reg_init_globals(php_reg_globals *reg_globals TSRMLS_DC)
{
Expand Down Expand Up @@ -440,7 +440,7 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)

if ((*arg_pattern)->type == IS_STRING) {
if ((*arg_pattern)->value.str.val && (*arg_pattern)->value.str.len)
pattern = estrndup((*arg_pattern)->value.str.val,(*arg_pattern)->value.str.len);
pattern = estrndup((*arg_pattern)->value.str.val, (*arg_pattern)->value.str.len);
else
pattern = empty_string;
} else {
Expand Down Expand Up @@ -473,7 +473,7 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
if (ret == (char *) -1) {
RETVAL_FALSE;
} else {
RETVAL_STRING(ret,1);
RETVAL_STRING(ret, 1);
STR_FREE(ret);
}
STR_FREE(string);
Expand Down
26 changes: 13 additions & 13 deletions ext/standard/array.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static int array_key_compare(const void *a, const void *b)

static int array_reverse_key_compare(const void *a, const void *b)
{
return array_key_compare(a,b)*-1;
return array_key_compare(a, b)*-1;
}

/* {{{ proto int krsort(array array_arg [, int sort_flags])
Expand Down Expand Up @@ -225,7 +225,7 @@ PHP_FUNCTION(ksort)
sort_type_val = Z_LVAL_PP(sort_type);
}
set_compare_func(sort_type_val TSRMLS_CC);
if (zend_hash_sort(target_hash, qsort, array_key_compare,0) == FAILURE) {
if (zend_hash_sort(target_hash, qsort, array_key_compare, 0) == FAILURE) {
return;
}
RETURN_TRUE;
Expand Down Expand Up @@ -303,7 +303,7 @@ static int array_data_compare(const void *a, const void *b)

static int array_reverse_data_compare(const void *a, const void *b)
{
return array_data_compare(a,b)*-1;
return array_data_compare(a, b)*-1;
}

static int array_natural_general_compare(const void *a, const void *b, int fold_case)
Expand Down Expand Up @@ -420,7 +420,7 @@ PHP_FUNCTION(asort)
sort_type_val = Z_LVAL_PP(sort_type);
}
set_compare_func(sort_type_val TSRMLS_CC);
if (zend_hash_sort(target_hash, qsort, array_data_compare,0) == FAILURE) {
if (zend_hash_sort(target_hash, qsort, array_data_compare, 0) == FAILURE) {
return;
}
RETURN_TRUE;
Expand Down Expand Up @@ -449,7 +449,7 @@ PHP_FUNCTION(arsort)
sort_type_val = Z_LVAL_PP(sort_type);
}
set_compare_func(sort_type_val TSRMLS_CC);
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,0) == FAILURE) {
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare, 0) == FAILURE) {
RETURN_FALSE;
}
RETURN_TRUE;
Expand Down Expand Up @@ -478,7 +478,7 @@ PHP_FUNCTION(sort)
sort_type_val = Z_LVAL_PP(sort_type);
}
set_compare_func(sort_type_val TSRMLS_CC);
if (zend_hash_sort(target_hash, qsort, array_data_compare,1) == FAILURE) {
if (zend_hash_sort(target_hash, qsort, array_data_compare, 1) == FAILURE) {
RETURN_FALSE;
}
RETURN_TRUE;
Expand Down Expand Up @@ -507,7 +507,7 @@ PHP_FUNCTION(rsort)
sort_type_val = Z_LVAL_PP(sort_type);
}
set_compare_func(sort_type_val TSRMLS_CC);
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare,1) == FAILURE) {
if (zend_hash_sort(target_hash, qsort, array_reverse_data_compare, 1) == FAILURE) {
RETURN_FALSE;
}
RETURN_TRUE;
Expand Down Expand Up @@ -979,7 +979,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata TSRMLS_DC)

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

zend_hash_move_forward_ex(target_hash, &pos);
Expand Down Expand Up @@ -1331,7 +1331,7 @@ PHP_FUNCTION(range)
{
zval **zlow, **zhigh;

if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2,&zlow,&zhigh) == FAILURE) {
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &zlow, &zhigh) == FAILURE) {
WRONG_PARAM_COUNT;
}

Expand Down Expand Up @@ -2039,7 +2039,7 @@ PHP_FUNCTION(array_count_values)
MAKE_STD_ZVAL(data);
Z_TYPE_P(data) = IS_LONG;
Z_LVAL_P(data) = 1;
zend_hash_index_update(Z_ARRVAL_P(return_value),Z_LVAL_PP(entry), &data, sizeof(data), NULL);
zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_PP(entry), &data, sizeof(data), NULL);
} else {
Z_LVAL_PP(tmp)++;
}
Expand All @@ -2052,7 +2052,7 @@ PHP_FUNCTION(array_count_values)
MAKE_STD_ZVAL(data);
Z_TYPE_P(data) = IS_LONG;
Z_LVAL_P(data) = 1;
zend_hash_update(Z_ARRVAL_P(return_value),Z_STRVAL_PP(entry),Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
} else {
Z_LVAL_PP(tmp)++;
}
Expand Down Expand Up @@ -2227,9 +2227,9 @@ PHP_FUNCTION(array_flip)
}

if (Z_TYPE_PP(entry) == IS_LONG) {
zend_hash_index_update(Z_ARRVAL_P(return_value),Z_LVAL_PP(entry), &data, sizeof(data), NULL);
zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_PP(entry), &data, sizeof(data), NULL);
} else if (Z_TYPE_PP(entry) == IS_STRING) {
zend_hash_update(Z_ARRVAL_P(return_value),Z_STRVAL_PP(entry),Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
} else {
zval_ptr_dtor(&data); /* will free also zval structure */
php_error(E_WARNING, "Can only flip STRING and INTEGER values!");
Expand Down
16 changes: 8 additions & 8 deletions ext/standard/assert.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static PHP_INI_MH(OnChangeCallback)
MAKE_STD_ZVAL(ASSERTG(callback));

if (new_value) {
ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1);
ZVAL_STRINGL(ASSERTG(callback), new_value, new_value_length, 1);
} else {
ZVAL_EMPTY_STRING(ASSERTG(callback));
}
Expand Down Expand Up @@ -188,9 +188,9 @@ PHP_FUNCTION(assert)
MAKE_STD_ZVAL(args[1]);
MAKE_STD_ZVAL(args[2]);

ZVAL_STRING(args[0],SAFE_STRING(filename),1);
ZVAL_LONG (args[1],lineno);
ZVAL_STRING(args[2],SAFE_STRING(myeval),1);
ZVAL_STRING(args[0], SAFE_STRING(filename), 1);
ZVAL_LONG (args[1], lineno);
ZVAL_STRING(args[2], SAFE_STRING(myeval), 1);

MAKE_STD_ZVAL(retval);
ZVAL_FALSE(retval);
Expand All @@ -206,9 +206,9 @@ PHP_FUNCTION(assert)

if (ASSERTG(warning)) {
if (myeval) {
php_error(E_WARNING,"Assertion \"%s\" failed",myeval);
php_error(E_WARNING, "Assertion \"%s\" failed", myeval);
} else {
php_error(E_WARNING,"Assertion failed");
php_error(E_WARNING, "Assertion failed");
}
}

Expand All @@ -223,7 +223,7 @@ PHP_FUNCTION(assert)

PHP_FUNCTION(assert_options)
{
pval **what,**value;
pval **what, **value;
int oldint;
int ac = ZEND_NUM_ARGS();

Expand Down Expand Up @@ -282,7 +282,7 @@ PHP_FUNCTION(assert_options)
break;

default:
php_error(E_WARNING,"Unknown value %d.",Z_LVAL_PP(what));
php_error(E_WARNING, "Unknown value %d.", Z_LVAL_PP(what));
break;
}

Expand Down
4 changes: 2 additions & 2 deletions ext/standard/base64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ PHP_FUNCTION(base64_encode)
unsigned char *result;
int ret_length;

if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1,&str) == FAILURE) {
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &str) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(str);
Expand All @@ -179,7 +179,7 @@ PHP_FUNCTION(base64_decode)
unsigned char *result;
int ret_length;

if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1,&str) == FAILURE) {
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &str) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(str);
Expand Down
Loading

0 comments on commit c0404f4

Please sign in to comment.