develooper Front page | perl.php.sandwich.dev | Postings from August 2005

[svn:PHP-Sandwich] r1447 - PHP-Sandwich/trunk

From:
gschlossnagle
Date:
August 1, 2005 16:30
Subject:
[svn:PHP-Sandwich] r1447 - PHP-Sandwich/trunk
Message ID:
20050801232958.30845.qmail@x1.develooper.com
Author: gschlossnagle
Date: Mon Aug  1 16:29:58 2005
New Revision: 1447

Modified:
   PHP-Sandwich/trunk/PHP.xs
   PHP-Sandwich/trunk/phpinterp.c
Log:
compile error fixes in ZTS mode


Modified: PHP-Sandwich/trunk/PHP.xs
==============================================================================
--- PHP-Sandwich/trunk/PHP.xs	(original)
+++ PHP-Sandwich/trunk/PHP.xs	Mon Aug  1 16:29:58 2005
@@ -199,7 +199,6 @@ zval *SvZval(SV *sv TSRMLS_DC)
 SV *newSVzval(zval *zptr, PHP_Interpreter interp)
 {
   SV *retval;
-  void *old_ctx;
   INTERP_CTX_ENTER(interp->ctx);
   {
     TSRMLS_FETCH();
@@ -821,7 +820,6 @@ SV* PHP_V_C_NEXTKEY(pclass, lastkey)
       ulong index;
       char buf[32];
       HashTable *properties;
-      void *old_ctx;
 
       INTERP_CTX_ENTER(pclass->interp->ctx);
       {
@@ -855,7 +853,6 @@ SV* PHP_V_C_EXISTS(pclass, skey)
       char *key;
       uint keylen;
       HashTable *properties;
-      void *old_ctx;
 
       INTERP_CTX_ENTER(pclass->interp->ctx);
       {
@@ -882,7 +879,6 @@ SV *PHP_V_C_DELETE(pclass, skey)
       uint keylen;
       HashTable *properties;
       zval zkey;
-      void *old_ctx;
 
       INTERP_CTX_ENTER(pclass->interp->ctx);
       {
@@ -1076,7 +1072,6 @@ void PHP_V_C_DESTROY(in)
   CODE:
     {
       PHP_Interpreter_Class pclass;
-      void *old_ctx;
       MAGIC *mg;
       
       mg = mg_find((SvRV(in)), PERL_MAGIC_ext);
@@ -1094,55 +1089,6 @@ void PHP_V_C_DESTROY(in)
       free(pclass);
     }
 
-SV* PHP_V_C_create(in, class, ...)
-  SV *in;
-  char *class;
-  CODE:
-    {
-      PHP_Interpreter_Class pclass;
-      void *old_ctx;
-      char *croakstr = NULL;
-      MAGIC *mg;
-      zval *obj;
-      
-      mg = mg_find((SvRV(in)), PERL_MAGIC_ext);
-      if(!mg) return;
-      pclass = (PHP_Interpreter_Class) SvIV(SvRV(mg->mg_obj));
-      if(!pclass) return;
-      INTERP_CTX_ENTER(pclass->interp->ctx);
-      {
-        zend_fcall_info fci;
-        zval method;
-        zend_class_entry *ce;
-        int param_count = 0;
-        zval ***params = NULL;
-        TSRMLS_FETCH();
-        MAKE_STD_ZVAL(obj);
-        ce = zend_fetch_class(class, strlen(class), ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
-        object_init_ex(obj, ce);
-        INIT_ZVAL(method);
-        ZVAL_STRING(&method, class, 1);
-        fci.param_count = param_count;
-        fci.params = params;
-        fci.size = sizeof(fci);
-        fci.function_table = EG(function_table);
-        fci.function_name = &method;
-        fci.no_separation = 0;
-        fci.object_pp = &obj;
-        fci.retval_ptr_ptr = NULL;
-        if(zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE) {
-          croakstr = "an error occured in object constructor";
-        }
-        else {
-          RETVAL = newSVzval(obj, pclass->interp);
-        }
-      }
-      INTERP_CTX_LEAVE();
-      if(croakstr) croak(croakstr);
-    }
-  OUTPUT:
-    RETVAL
-
 MODULE = PHP::Interpreter PACKAGE = PHP::Interpreter::Resource PREFIX=PHP_V_R_
 
 REQUIRE:        1.9505

Modified: PHP-Sandwich/trunk/phpinterp.c
==============================================================================
--- PHP-Sandwich/trunk/phpinterp.c	(original)
+++ PHP-Sandwich/trunk/phpinterp.c	Mon Aug  1 16:29:58 2005
@@ -302,7 +302,6 @@ cleanup:
 int sandwich_include(sandwich_per_interp *interp, char *file, int once)
 {
   int rv = 0;
-  void *old_ctx = NULL;
   INTERP_CTX_ENTER(interp->ctx);
   {
     zend_file_handle file_handle;



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About