Changeset 620 for branches/1.3


Ignore:
Timestamp:
2009-07-05T10:05:41+02:00 (5 years ago)
Author:
moo
Message:

merged r499,r501,r502 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/Makefile.frag

    r604 r620  
    3232disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c 
    3333 
    34 $(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h 
    35 xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h 
     34$(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h 
     35xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h 
    3636 
    3737xcachesvnclean: clean 
  • branches/1.3/xcache.c

    r619 r620  
    12861286    if (op_array->arg_info) { 
    12871287        for (i = 0; i < op_array->num_args; i++) { 
    1288             efree((char*)op_array->arg_info[i].name); 
    1289             if (op_array->arg_info[i].class_name) { 
    1290                 efree((char*)op_array->arg_info[i].class_name); 
     1288            efree((char *) ZSTR_V(op_array->arg_info[i].name)); 
     1289            if (ZSTR_V(op_array->arg_info[i].class_name)) { 
     1290                efree((char *) ZSTR_V(op_array->arg_info[i].class_name)); 
    12911291            } 
    12921292        } 
     
    14341434        xc_php_caches = NULL; 
    14351435    } 
    1436     xc_php_hcache.size = 0; 
    14371436 
    14381437    if (xc_var_caches) { 
     
    14401439        xc_var_caches = NULL; 
    14411440    } 
    1442     xc_var_hcache.size = 0; 
    14431441 
    14441442    if (shm) { 
     
    15181516    } 
    15191517 
    1520     if (xc_var_hcache.size && !XG(var_holds)) { 
     1518    if (xc_initized && xc_var_hcache.size && !XG(var_holds)) { 
    15211519        XG(var_holds) = calloc(xc_var_hcache.size, sizeof(xc_stack_t)); 
    15221520        for (i = 0; i < xc_var_hcache.size; i ++) { 
Note: See TracChangeset for help on using the changeset viewer.