Merge pull request #827 from sjinks/dead-code-elimination

Remove dead code
phalcon · Jul 11, 2013 · 412289e · 412289e
2 parents a91d975 + 72c7af8
commit 412289e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
@@ -54,10 +54,6 @@ extern void PHALCON_FASTCALL phalcon_copy_ctor(zval *destiny, zval *origin);
 #define PHALCON_ALLOC_ZVAL(z) \
 	ALLOC_ZVAL(z); INIT_PZVAL(z); ZVAL_NULL(z);
 
-#define PHALCON_INIT_VAR_OLD(z) \
-	PHALCON_ALLOC_ZVAL(z); \
-	phalcon_memory_observe(&z TSRMLS_CC);
-
 #define PHALCON_INIT_VAR(z) \
 	phalcon_memory_alloc(&z TSRMLS_CC);
 

diff --git a/ext/kernel/string.c b/ext/kernel/string.c
@@ -1095,7 +1095,7 @@ zval *phalcon_eol(int eol TSRMLS_DC) {
     if (eol) {
 	    ZVAL_STRING(local_eol, PHP_EOL, 1);
     } else {
-        ZVAL_STRING(local_eol, "", 1);
+        ZVAL_EMPTY_STRING(local_eol);
     }
 
     return local_eol;

diff --git a/ext/kernel/variables.c b/ext/kernel/variables.c
@@ -35,10 +35,6 @@ void phalcon_serialize(zval *return_value, zval **var  TSRMLS_DC) {
 	php_serialize_data_t var_hash;
 	smart_str buf = {0};
 
-	Z_TYPE_P(return_value) = IS_STRING;
-	Z_STRVAL_P(return_value) = NULL;
-	Z_STRLEN_P(return_value) = 0;
-
 	PHP_VAR_SERIALIZE_INIT(var_hash);
 	php_var_serialize(&buf, var, &var_hash TSRMLS_CC);
 	PHP_VAR_SERIALIZE_DESTROY(var_hash);