Changeset 935 for trunk/utils.c

Timestamp:

2012-06-28T09:38:59+02:00 (11 months ago)

Author:

moo

Message:

simplify sandbox/compiler_result code, removed alloc

File:

• trunk/utils.c (modified) (5 diffs)

trunk/utils.c

@@ -42 +42 @@
         HashTable *class_table)
 {
-    if (cr) {
-        cr->alloc = 0;
-    }
-    else {
-        cr = emalloc(sizeof(xc_compile_result_t));
-        cr->alloc = 1;
-    }
+    assert(cr);
     cr->op_array       = op_array;
     cr->function_table = function_table;
@@ -57 +51 @@
 xc_compile_result_t *xc_compile_result_init_cur(xc_compile_result_t *cr, zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
+    assert(cr);
     return xc_compile_result_init(cr, op_array, CG(function_table), CG(class_table));
 }
@@ -62 +57 @@
 void xc_compile_result_free(xc_compile_result_t *cr) /* {{{ */
 {
-    if (cr->alloc) {
-        efree(cr);
-    }
 }
 /* }}} */
@@ -743 +735 @@
     HashTable *h;
 
-    if (sandbox) {
-        memset(sandbox, 0, sizeof(sandbox[0]));
-    }
-    else {
-        ECALLOC_ONE(sandbox);
-        sandbox->alloc = 1;
-    }
+    assert(sandbox);
+    memset(sandbox, 0, sizeof(sandbox[0]));
 
     memcpy(&OG(included_files), &EG(included_files), sizeof(EG(included_files)));
@@ -972 +959 @@
     CG(compiler_options) = sandbox->orig_compiler_options;
 #endif
-
-    if (sandbox->alloc) {
-        efree(sandbox);
-    }
 }
 /* }}} */