[PHP-CVS] cvs: php4(PHP_4_3) /ext/informix ifx.ec

[Jani Taskinen]

sniper          Thu Feb 20 23:58:09 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/informix  ifx.ec 
  Log:
  Fix ZTS build
  
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.69.2.6 php4/ext/informix/ifx.ec:1.69.2.7
--- php4/ext/informix/ifx.ec:1.69.2.6   Thu Feb 20 07:09:19 2003
+++ php4/ext/informix/ifx.ec    Thu Feb 20 23:58:08 2003
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: ifx.ec,v 1.69.2.6 2003/02/20 12:09:19 nobbie Exp $ */
+/* $Id: ifx.ec,v 1.69.2.7 2003/02/21 04:58:08 sniper Exp $ */
 
 /* -------------------------------------------------------------------
  * if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -320,11 +320,9 @@
 
 static void ifx_free_blob(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
-       IFX_IDRES *Ifx_blob = (IFX_IDRES *)rsrc->ptr;
-
-       
-       php_intifx_release_blob(&Ifx_blob->BLOB.blob_data TSRMLS_C);
+       IFX_IDRES *Ifx_blob = (IFX_IDRES *)rsrc->ptr;
 
+       php_intifx_release_blob(&Ifx_blob->BLOB.blob_data TSRMLS_CC);
        efree(Ifx_blob); 
 }
 
@@ -785,7 +783,7 @@
        affected_rows = sqlca.sqlerrd[0];       /* save estimated affected rows */
        for (e = 0; e < 6; e++) sqlerrd[e] = sqlca.sqlerrd[e];
    
-       num_params = php_intifx_preparse(statement);
+       num_params = php_intifx_preparse(statement TSRMLS_CC);
 
        Ifx_Result = (IFX_RES *) emalloc(sizeof(IFX_RES));
        if (Ifx_Result == NULL) {
@@ -808,7 +806,7 @@
                Ifx_Result->res_id[i] = -1;
        }
 
-       if (!php_intifx_alloc_ibind(Ifx_Result, num_params))   {
+       if (!php_intifx_alloc_ibind(Ifx_Result, num_params TSRMLS_CC))   {
                IFXG(sv_sqlcode) = SQLCODE;
                EXEC SQL free :statemid;
                efree(Ifx_Result);
@@ -816,8 +814,7 @@
                RETURN_FALSE;
        }
 
-
-       desc_count = php_intifx_count_descriptors(statemid);
+       desc_count = php_intifx_count_descriptors(statemid TSRMLS_CC);
        if (desc_count == 0)
                desc_count = 1;
 
@@ -1190,7 +1187,7 @@
        affected_rows = sqlca.sqlerrd[0];       /* save estimated affected rows */
        for (e = 0; e < 6; e++) sqlerrd[e] = sqlca.sqlerrd[e];
 
-       num_params = php_intifx_preparse(statement);
+       num_params = php_intifx_preparse(statement TSRMLS_CC);
 
        Ifx_Result = (IFX_RES *) emalloc(sizeof(IFX_RES));
        if (Ifx_Result == NULL) {
@@ -1214,7 +1211,7 @@
                Ifx_Result->res_id[i] = -1;
        }
 
-       if (!php_intifx_alloc_ibind(Ifx_Result, num_params))   {
+       if (!php_intifx_alloc_ibind(Ifx_Result, num_params TSRMLS_CC))   {
                IFXG(sv_sqlcode) = SQLCODE;
                EXEC SQL free :statemid;
                efree(Ifx_Result);
@@ -1222,7 +1219,7 @@
                RETURN_FALSE;
        }
 
-       desc_count = php_intifx_count_descriptors(statemid);
+       desc_count = php_intifx_count_descriptors(statemid TSRMLS_CC);
        if (desc_count == 0)
                desc_count = 1;
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php