cvs: ZendEngine2 / zend_builtin_functions.c
| From: | Andi Gutmans | Date: | Sat, 24 Aug 2002 20:52:52 +0000 |
| Subject: | cvs: ZendEngine2 / zend_builtin_functions.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-360@lists.php.net to get a copy of this message | ||
andi Sat Aug 24 16:52:52 2002 EDT
Modified files:
/ZendEngine2 zend_builtin_functions.c
Log:
- Whitespace and better variable name
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.136 ZendEngine2/zend_builtin_functions.c:1.137
--- ZendEngine2/zend_builtin_functions.c:1.136 Sat Aug 24 05:05:44 2002
+++ ZendEngine2/zend_builtin_functions.c Sat Aug 24 16:52:52 2002
@@ -1324,18 +1324,32 @@
add_assoc_zval_ex(stack_frame, "args", sizeof("args"),
debug_backtrace_get_args(&cur_arg_pos, 0 TSRMLS_CC));
} else {
/* i know this is kinda ugly, but i'm trying to avoid extra cycles in the main execution
loop */
- int fn = 1;
+ zend_bool have_function_name = 1;
switch (ptr->opline->op2.u.constant.value.lval) {
- case ZEND_EVAL: function_name = "eval"; fn = 0; break;
- case ZEND_INCLUDE: function_name = "include"; break;
- case ZEND_REQUIRE: function_name = "require"; break;
- case ZEND_INCLUDE_ONCE: function_name = "include_once"; break;
- case ZEND_REQUIRE_ONCE: function_name = "require_once"; break;
- default: function_name = "unknown - please report a bug"; fn = 0; break;
+ case ZEND_EVAL:
+ function_name = "eval";
+ have_function_name = 0;
+ break;
+ case ZEND_INCLUDE:
+ function_name = "include";
+ break;
+ case ZEND_REQUIRE:
+ function_name = "require";
+ break;
+ case ZEND_INCLUDE_ONCE:
+ function_name = "include_once";
+ break;
+ case ZEND_REQUIRE_ONCE:
+ function_name = "require_once";
+ break;
+ default:
+ function_name = "unknown - please report a bug";
+ have_function_name = 0;
+ break;
}
- if (fn && include_filename) {
+ if (have_function_name && include_filename) {
/* include_filename always points to the last known filename.
if we have called include in the frame above - this is the file we have included
*/