Changeset 131 for trunk/utils.c

Timestamp:

2006-09-03T09:37:05+02:00 (7 years ago)

Author:

moo

Message:

move open_files out of sandbox, it's not needed

File:

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

trunk/utils.c

@@ -371 +371 @@
 
     memcpy(&OG(included_files), &EG(included_files), sizeof(EG(included_files)));
-    memcpy(&OG(open_files), &CG(open_files), sizeof(CG(open_files)));
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -388 +387 @@
 
     TG(included_files) = &EG(included_files);
-    TG(open_files)     = &CG(open_files);
-
-    zend_llist_init(TG(open_files), sizeof(zend_file_handle), (void (*)(void *)) zend_file_handle_dtor, 0);
+
     zend_hash_init_ex(TG(included_files), 5, NULL, NULL, 0, 1);
 #ifdef HAVE_XCACHE_CONSTANT
@@ -440 +437 @@
     i = 1;
     zend_hash_add(&OG(included_files), sandbox->filename, strlen(sandbox->filename) + 1, (void *)&i, sizeof(int), NULL);
-    for (handle = zend_llist_get_first_ex(TG(open_files), &lpos);
-            handle;
-            handle = zend_llist_get_next_ex(TG(open_files), &lpos)) {
-        zend_llist_add_element(&OG(open_files), handle);
-    }
 }
 /* }}} */
@@ -466 +458 @@
         TG(function_table).pDestructor = NULL;
         TG(class_table).pDestructor = NULL;
-        TG(open_files)->dtor = NULL;
     }
 
@@ -476 +467 @@
     zend_hash_destroy(&TG(class_table));
     zend_hash_destroy(TG(included_files));
-    zend_llist_destroy(TG(open_files));
 
     /* restore orig here, as EG/CG holded tmp before */
     memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
-    memcpy(&CG(open_files),     &OG(open_files),     sizeof(CG(open_files)));
 
     if (sandbox->alloc) {