cvs: Zend / zend.c zend_builtin_functions.c zend_execute.c zend_execute_API.c zend_ini.c zend_list.c zend_operators.c
| From: | Andi Gutmans | Date: | Sat, 30 Nov 2002 11:15:13 +0000 |
| Subject: | cvs: Zend / zend.c zend_builtin_functions.c zend_execute.c zend_execute_API.c zend_ini.c zend_list.c zend_operators.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-674@lists.php.net to get a copy of this message | ||
andi Sat Nov 30 06:15:13 2002 EDT
Modified files:
/Zend zend.c zend_builtin_functions.c zend_execute.c
zend_execute_API.c zend_ini.c zend_list.c zend_operators.c
Log:
- Whitespace fixes
Index: Zend/zend.c
diff -u Zend/zend.c:1.164 Zend/zend.c:1.165
--- Zend/zend.c:1.164 Sat Nov 30 05:51:56 2002
+++ Zend/zend.c Sat Nov 30 06:15:12 2002
@@ -149,7 +149,7 @@
zend_hash_internal_pointer_reset_ex(ht, &iterator);
while (zend_hash_get_current_data_ex(ht, (void **) &tmp, &iterator) == SUCCESS) {
- if(i++ > 0) {
+ if (i++ > 0) {
ZEND_PUTS(",");
}
ZEND_PUTS("[");
@@ -248,7 +248,7 @@
{
zend_write_func_t write_func = zend_write;
- switch(expr->type) {
+ switch (expr->type) {
case IS_ARRAY:
ZEND_PUTS("Array (");
if (++expr->value.ht->nApplyCount>1) {
Index: Zend/zend_builtin_functions.c
diff -u Zend/zend_builtin_functions.c:1.128 Zend/zend_builtin_functions.c:1.129
--- Zend/zend_builtin_functions.c:1.128 Sat Nov 30 05:51:56 2002
+++ Zend/zend_builtin_functions.c Sat Nov 30 06:15:12 2002
@@ -1184,7 +1184,7 @@
zend_hash_internal_pointer_reset_ex(arg_array->value.ht, &iterator);
while (zend_hash_get_current_data_ex(arg_array->value.ht, (void **) &tmp, &iterator)
== SUCCESS) {
- if(i++) {
+ if (i++) {
ZEND_PUTS(", ");
}
zend_print_flat_zval_r(*tmp);
@@ -1306,7 +1306,7 @@
}
zend_printf("#%-2d ", indent);
- if(class_name) {
+ if (class_name) {
ZEND_PUTS(class_name);
ZEND_PUTS(call_type);
}
Index: Zend/zend_execute.c
diff -u Zend/zend_execute.c:1.318 Zend/zend_execute.c:1.319
--- Zend/zend_execute.c:1.318 Sun Nov 17 17:00:19 2002
+++ Zend/zend_execute.c Sat Nov 30 06:15:12 2002
@@ -2101,7 +2101,7 @@
file_handle.free_filename = 0;
if (file_handle.handle.fp) {
- if( !opened_path ) {
+ if (!opened_path) {
opened_path = file_handle.opened_path = estrndup(inc_filename->value.str.val,
inc_filename->value.str.len);
}
Index: Zend/zend_execute_API.c
diff -u Zend/zend_execute_API.c:1.156 Zend/zend_execute_API.c:1.157
--- Zend/zend_execute_API.c:1.156 Sun Nov 17 08:26:37 2002
+++ Zend/zend_execute_API.c Sat Nov 30 06:15:13 2002
@@ -358,7 +358,7 @@
continue;
}
- if(const_value.type == IS_STRING &&
+ if (const_value.type == IS_STRING &&
const_value.value.str.len == str_index_len-1 &&
!strncmp(const_value.value.str.val, str_index, str_index_len)) {
/* constant value is the same as its name */
Index: Zend/zend_ini.c
diff -u Zend/zend_ini.c:1.23 Zend/zend_ini.c:1.24
--- Zend/zend_ini.c:1.23 Mon Sep 23 08:00:39 2002
+++ Zend/zend_ini.c Sat Nov 30 06:15:13 2002
@@ -315,7 +315,7 @@
display_string = ini_entry->orig_value;
display_string_length = ini_entry->orig_value_length;
} else {
- if(zend_uv.html_errors) {
+ if (zend_uv.html_errors) {
display_string = NO_VALUE_HTML;
display_string_length = sizeof(NO_VALUE_HTML)-1;
} else {
@@ -327,7 +327,7 @@
display_string = ini_entry->value;
display_string_length = ini_entry->value_length;
} else {
- if(zend_uv.html_errors) {
+ if (zend_uv.html_errors) {
display_string = NO_VALUE_HTML;
display_string_length = sizeof(NO_VALUE_HTML)-1;
} else {
Index: Zend/zend_list.c
diff -u Zend/zend_list.c:1.53 Zend/zend_list.c:1.54
--- Zend/zend_list.c:1.53 Thu Apr 18 13:37:29 2002
+++ Zend/zend_list.c Sat Nov 30 06:15:13 2002
@@ -313,8 +313,8 @@
HashPosition pos;
zend_hash_internal_pointer_reset_ex(&list_destructors, &pos);
- while(zend_hash_get_current_data_ex(&list_destructors, (void **)&lde, &pos) ==
SUCCESS) {
- if(strcmp(type_name, lde->type_name) == 0) {
+ while (zend_hash_get_current_data_ex(&list_destructors, (void **)&lde, &pos) ==
SUCCESS) {
+ if (strcmp(type_name, lde->type_name) == 0) {
#if 0
printf("Found resource id %d for resource type %s\n", (*lde).resource_id, type_name);
#endif
Index: Zend/zend_operators.c
diff -u Zend/zend_operators.c:1.129 Zend/zend_operators.c:1.130
--- Zend/zend_operators.c:1.129 Mon Oct 14 09:41:50 2002
+++ Zend/zend_operators.c Sat Nov 30 06:15:13 2002
@@ -1443,7 +1443,7 @@
{
switch (op1->type) {
case IS_LONG:
- if(op1->value.lval == LONG_MAX) {
+ if (op1->value.lval == LONG_MAX) {
/* switch to double */
double d = (double)op1->value.lval;
ZVAL_DOUBLE(op1, d+1);
@@ -1465,7 +1465,7 @@
switch (is_numeric_string(strval, op1->value.str.len, &lval, &dval, 0)) {
case IS_LONG:
- if(lval == LONG_MAX) {
+ if (lval == LONG_MAX) {
/* switch to double */
double d = (double)lval;
ZVAL_DOUBLE(op1, d+1);
@@ -1505,7 +1505,7 @@
switch (op1->type) {
case IS_LONG:
- if(op1->value.lval == LONG_MIN) {
+ if (op1->value.lval == LONG_MIN) {
double d = (double)op1->value.lval;
ZVAL_DOUBLE(op1, d-1);
} else {
@@ -1525,7 +1525,7 @@
switch(is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0))
{
case IS_LONG:
STR_FREE(op1->value.str.val);
- if(lval == LONG_MIN) {
+ if (lval == LONG_MIN) {
double d = (double)lval;
ZVAL_DOUBLE(op1, d-1);
} else {