summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2003-03-04 13:36:16 +0000
committerZeev Suraski <zeev@php.net>2003-03-04 13:36:16 +0000
commite0c3e2cf93c6562514e52e15e891b34dee977499 (patch)
tree28fc336cba316105fd50cc3d33042de3b1750d82
parent4c0c7837a790d7a57e9ae87d70919c46433ad947 (diff)
downloadphp-git-e0c3e2cf93c6562514e52e15e891b34dee977499.tar.gz
Remove redundant code
-rw-r--r--Zend/zend_compile.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4e62d3ca99..1013ebdb0a 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2154,17 +2154,8 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
zend_error(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", class_name->u.constant.value.str.val);
}
- if (CG(active_class_entry)) {
- new_class_entry->name_length = sizeof("::")-1 + class_name->u.constant.value.str.len + CG(active_class_entry)->name_length;
- new_class_entry->name = emalloc(new_class_entry->name_length+1);
- strcpy(new_class_entry->name, CG(active_class_entry)->name);
- strcat(new_class_entry->name, "::");
- strcat(new_class_entry->name, class_name->u.constant.value.str.val);
- STR_FREE(class_name->u.constant.value.str.val);
- } else {
- new_class_entry->name = class_name->u.constant.value.str.val;
- new_class_entry->name_length = class_name->u.constant.value.str.len;
- }
+ new_class_entry->name = class_name->u.constant.value.str.val;
+ new_class_entry->name_length = class_name->u.constant.value.str.len;
new_class_entry->type = ZEND_USER_CLASS;
new_class_entry->parent = NULL;