cvs: ZendEngine2 / zend_compile.c

zeev Tue Mar 4 08:36:17 2003 EDT Modified files: /ZendEngine2 zend_compile.c Log: Remove redundant code Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.379 ZendEngine2/zend_compile.c:1.380 --- ZendEngine2/zend_compile.c:1.379 Sun Mar 2 08:33:31 2003 +++ ZendEngine2/zend_compile.c Tue Mar 4 08:36:16 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.379 2003/03/02 13:33:31 zeev Exp $ */ +/* $Id: zend_compile.c,v 1.380 2003/03/04 13:36:16 zeev Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -2154,17 +2154,8 @@ 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;