cvs: Zend / zend.c zend_API.c zend_builtin_functions.c zend_compile.c zend_execute.c zend_execute_API.c zend_indent.c zend_opcode.c zend_operators.c
zend_operators.h zend_variables.c
| From: | Andi Gutmans | Date: | Sat, 30 Nov 2002 11:18:21 +0000 |
| Subject: | cvs: Zend / zend.c zend_API.c zend_builtin_functions.c zend_compile.c zend_execute.c zend_execute_API.c zend_indent.c zend_opcode.c zend_operators.c zend_operators.h zend_variables.c |
||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-675@lists.php.net to get a copy of this message | ||
andi Sat Nov 30 06:18:21 2002 EDT
Modified files:
/Zend zend.c zend_API.c zend_builtin_functions.c zend_compile.c
zend_execute.c zend_execute_API.c zend_indent.c zend_opcode.c
zend_operators.c zend_operators.h zend_variables.c
Log:
- More whitespace
Index: Zend/zend.c
diff -u Zend/zend.c:1.165 Zend/zend.c:1.166
--- Zend/zend.c:1.165 Sat Nov 30 06:15:12 2002
+++ Zend/zend.c Sat Nov 30 06:18:20 2002
@@ -289,7 +289,7 @@
ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent)
{
- switch(expr->type) {
+ switch (expr->type) {
case IS_ARRAY:
ZEND_PUTS("Array\n");
if (++expr->value.ht->nApplyCount>1) {
Index: Zend/zend_API.c
diff -u Zend/zend_API.c:1.113 Zend/zend_API.c:1.114
--- Zend/zend_API.c:1.113 Wed Oct 9 10:17:52 2002
+++ Zend/zend_API.c Sat Nov 30 06:18:20 2002
@@ -1161,7 +1161,7 @@
*/
int module_registry_cleanup(zend_module_entry *module TSRMLS_DC)
{
- switch(module->type) {
+ switch (module->type) {
case MODULE_PERSISTENT:
if (module->request_shutdown_func) {
#if 0
Index: Zend/zend_builtin_functions.c
diff -u Zend/zend_builtin_functions.c:1.129 Zend/zend_builtin_functions.c:1.130
--- Zend/zend_builtin_functions.c:1.129 Sat Nov 30 06:15:12 2002
+++ Zend/zend_builtin_functions.c Sat Nov 30 06:18:20 2002
@@ -425,7 +425,7 @@
int case_sensitive;
zend_constant c;
- switch(ZEND_NUM_ARGS()) {
+ switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &var, &val)==FAILURE) {
RETURN_FALSE;
@@ -448,7 +448,7 @@
break;
}
- switch((*val)->type) {
+ switch ((*val)->type) {
case IS_LONG:
case IS_DOUBLE:
case IS_STRING:
@@ -832,7 +832,7 @@
int error_type = E_USER_NOTICE;
zval **z_error_type, **z_error_message;
- switch(ZEND_NUM_ARGS()) {
+ switch (ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &z_error_message)==FAILURE) {
ZEND_WRONG_PARAM_COUNT();
Index: Zend/zend_compile.c
diff -u Zend/zend_compile.c:1.240 Zend/zend_compile.c:1.241
--- Zend/zend_compile.c:1.240 Sun Nov 10 00:25:27 2002
+++ Zend/zend_compile.c Sat Nov 30 06:18:20 2002
@@ -997,7 +997,7 @@
}
if (original_op == ZEND_SEND_VAR) {
- switch(op) {
+ switch (op) {
case ZEND_SEND_VAR_NO_REF:
zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC);
break;
@@ -1936,7 +1936,7 @@
opline = get_next_op(CG(active_op_array) TSRMLS_CC);
if (dimension == tmp_dimension_llist->head) { /* first */
last_container = *expr;
- switch(expr->op_type) {
+ switch (expr->op_type) {
case IS_VAR:
opline->opcode = ZEND_FETCH_DIM_R;
break;
@@ -2459,7 +2459,7 @@
zendlval->u.constant.type = IS_LONG;
retval = lex_scan(&zendlval->u.constant TSRMLS_CC);
- switch(retval) {
+ switch (retval) {
case T_COMMENT:
case T_OPEN_TAG:
case T_WHITESPACE:
Index: Zend/zend_execute.c
diff -u Zend/zend_execute.c:1.319 Zend/zend_execute.c:1.320
--- Zend/zend_execute.c:1.319 Sat Nov 30 06:15:12 2002
+++ Zend/zend_execute.c Sat Nov 30 06:18:20 2002
@@ -70,7 +70,7 @@
static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, int *should_free TSRMLS_DC)
{
- switch(node->op_type) {
+ switch (node->op_type) {
case IS_CONST:
*should_free = 0;
return &node->u.constant;
@@ -131,7 +131,7 @@
static inline zval *_get_object_zval_ptr(znode *node, temp_variable *Ts, int *should_free
TSRMLS_DC)
{
- switch(node->op_type) {
+ switch (node->op_type) {
case IS_TMP_VAR:
*should_free = 1;
return &Ts[node->u.var].tmp_var;
@@ -1050,7 +1050,7 @@
zend_clean_garbage(TSRMLS_C);
- switch(EX(opline)->opcode) {
+ switch (EX(opline)->opcode) {
case ZEND_ADD:
EG(binary_op) = add_function;
goto binary_op_addr;
@@ -2013,7 +2013,7 @@
}
}
if (offset) {
- switch(offset->type) {
+ switch (offset->type) {
case IS_DOUBLE:
zend_hash_index_update(array_ptr->value.ht, (long) offset->value.dval, &expr_ptr,
sizeof(zval *), NULL);
break;
Index: Zend/zend_execute_API.c
diff -u Zend/zend_execute_API.c:1.157 Zend/zend_execute_API.c:1.158
--- Zend/zend_execute_API.c:1.157 Sat Nov 30 06:15:13 2002
+++ Zend/zend_execute_API.c Sat Nov 30 06:18:20 2002
@@ -233,7 +233,7 @@
if (!zend_is_executing(TSRMLS_C)) {
return NULL;
}
- switch(EG(function_state_ptr)->function->type) {
+ switch (EG(function_state_ptr)->function->type) {
case ZEND_USER_FUNCTION: {
char *function_name = ((zend_op_array *)
EG(function_state_ptr)->function)->function_name;
Index: Zend/zend_indent.c
diff -u Zend/zend_indent.c:1.17 Zend/zend_indent.c:1.18
--- Zend/zend_indent.c:1.17 Sun Jan 6 10:21:09 2002
+++ Zend/zend_indent.c Sat Nov 30 06:18:20 2002
@@ -80,7 +80,7 @@
default:
if (token.type==0) {
/* keyword */
- switch(token_type) {
+ switch (token_type) {
case ',':
ZEND_PUTS(", ");
goto dflt_printout;
Index: Zend/zend_opcode.c
diff -u Zend/zend_opcode.c:1.56 Zend/zend_opcode.c:1.57
--- Zend/zend_opcode.c:1.56 Sun Jan 6 10:21:09 2002
+++ Zend/zend_opcode.c Sat Nov 30 06:18:20 2002
@@ -309,7 +309,7 @@
ZEND_API unary_op_type get_unary_op(int opcode)
{
- switch(opcode) {
+ switch (opcode) {
case ZEND_BW_NOT:
return (unary_op_type) bitwise_not_function;
break;
Index: Zend/zend_operators.c
diff -u Zend/zend_operators.c:1.130 Zend/zend_operators.c:1.131
--- Zend/zend_operators.c:1.130 Sat Nov 30 06:15:13 2002
+++ Zend/zend_operators.c Sat Nov 30 06:18:20 2002
@@ -509,7 +509,7 @@
ZEND_API void convert_to_array(zval *op)
{
- switch(op->type) {
+ switch (op->type) {
case IS_ARRAY:
return;
break;
@@ -532,7 +532,7 @@
ZEND_API void convert_to_object(zval *op)
{
- switch(op->type) {
+ switch (op->type) {
/* OBJECTS_FIXME */
case IS_ARRAY:
Z_TYPE_P(op) = IS_OBJECT;
@@ -1522,7 +1522,7 @@
op1->type = IS_LONG;
break;
}
- switch(is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0))
{
+ 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) {
Index: Zend/zend_operators.h
diff -u Zend/zend_operators.h:1.55 Zend/zend_operators.h:1.56
--- Zend/zend_operators.h:1.55 Sat Oct 12 16:35:34 2002
+++ Zend/zend_operators.h Sat Nov 30 06:18:20 2002
@@ -107,7 +107,7 @@
register char *ptr=str, *end=str+length;
while (ptr<end) {
- switch(*ptr++) {
+ switch (*ptr++) {
case 'e':
case 'E':
/* scientific notation, not handled by the BC library */
Index: Zend/zend_variables.c
diff -u Zend/zend_variables.c:1.44 Zend/zend_variables.c:1.45
--- Zend/zend_variables.c:1.44 Mon Sep 9 11:32:01 2002
+++ Zend/zend_variables.c Sat Nov 30 06:18:20 2002
@@ -37,7 +37,7 @@
if (zvalue->type==IS_LONG) {
return;
}
- switch(zvalue->type & ~IS_CONSTANT_INDEX) {
+ switch (zvalue->type & ~IS_CONSTANT_INDEX) {
case IS_STRING:
case IS_CONSTANT:
CHECK_ZVAL_STRING_REL(zvalue);