iliaa Sun Jan 19 03:32:24 2003 EDT
Modified files:
/php4/ext/dbase dbf_rec.c
/php4/ext/oci8 oci8.c
/php4/ext/oracle oracle.c
/php4/ext/rpc/java java.c
/php4/ext/w32api w32api.c
Log:
ZTS fixes.
Index: php4/ext/dbase/dbf_rec.c
diff -u php4/ext/dbase/dbf_rec.c:1.8 php4/ext/dbase/dbf_rec.c:1.9
--- php4/ext/dbase/dbf_rec.c:1.8 Sat Jan 18 19:45:40 2003
+++ php4/ext/dbase/dbf_rec.c Sun Jan 19 03:32:21 2003
@@ -136,6 +136,7 @@
/* Try to truncate the file to the right size. */
if (ftruncate(dbh->db_fd, out_off) != 0) {
+ TSRMLS_FETCH();
php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbase_pack() couldn't
truncate the file to the right size. Some deleted records may still be left in
there.");
}
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.200 php4/ext/oci8/oci8.c:1.201
--- php4/ext/oci8/oci8.c:1.200 Sat Jan 18 19:45:41 2003
+++ php4/ext/oci8/oci8.c Sun Jan 19 03:32:22 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.200 2003/01/19 00:45:41 iliaa Exp $ */
+/* $Id: oci8.c,v 1.201 2003/01/19 08:32:22 iliaa Exp $ */
/* TODO list:
*
@@ -640,7 +640,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.200 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.201 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -1113,6 +1113,7 @@
{
oci_out_column *outcol = NULL;
int i;
+ TSRMLS_FETCH();
if (statement->columns == 0) { /* we release the columns at the end of a fetch
*/
return NULL;
Index: php4/ext/oracle/oracle.c
diff -u php4/ext/oracle/oracle.c:1.84 php4/ext/oracle/oracle.c:1.85
--- php4/ext/oracle/oracle.c:1.84 Sat Jan 18 19:45:42 2003
+++ php4/ext/oracle/oracle.c Sun Jan 19 03:32:22 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oracle.c,v 1.84 2003/01/19 00:45:42 iliaa Exp $ */
+/* $Id: oracle.c,v 1.85 2003/01/19 08:32:22 iliaa Exp $ */
/* comment out the next line if you're on Oracle 7.x and don't have the olog
call. */
@@ -619,7 +619,7 @@
}
ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection",
le_conn, le_pconn);
- cursor = (oraCursor *)emalloc(sizeof(oraCursor);
+ cursor = (oraCursor *)emalloc(sizeof(oraCursor));
memset(cursor, 0, sizeof(oraCursor));
if (oopen(&cursor->cda, &conn->lda, (text *) 0, -1, -1, (text *) 0, -1)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open new cursor
(%s)",
Index: php4/ext/rpc/java/java.c
diff -u php4/ext/rpc/java/java.c:1.74 php4/ext/rpc/java/java.c:1.75
--- php4/ext/rpc/java/java.c:1.74 Sat Jan 18 19:45:48 2003
+++ php4/ext/rpc/java/java.c Sun Jan 19 03:32:22 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: java.c,v 1.74 2003/01/19 00:45:48 iliaa Exp $ */
+/* $Id: java.c,v 1.75 2003/01/19 08:32:22 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -407,7 +407,7 @@
/* {{{ checkError
*/
-static int checkError(pval *value)
+static int checkError(pval *value TSRMLS_DC)
{
if (Z_TYPE_P(value) == IS_EXCEPTION) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", Z_STRVAL_P(value));
@@ -493,7 +493,7 @@
efree(arguments);
pval_destructor(&function_name->element);
- checkError((pval*)(long)result);
+ checkError((pval*)(long)result TSRMLS_CC);
}
/* }}} */
@@ -593,7 +593,7 @@
TSRMLS_FETCH();
presult = _java_getset_property(property_reference, 0 TSRMLS_CC);
- checkError(&presult);
+ checkError(&presult TSRMLS_CC);
return presult;
}
/* }}} */
@@ -606,7 +606,7 @@
TSRMLS_FETCH();
presult = _java_getset_property(property_reference, _java_makeArray(1, &value
TSRMLS_CC) TSRMLS_CC);
- return checkError(&presult) ? FAILURE : SUCCESS;
+ return checkError(&presult TSRMLS_CC) ? FAILURE : SUCCESS;
}
/* }}} */
Index: php4/ext/w32api/w32api.c
diff -u php4/ext/w32api/w32api.c:1.7 php4/ext/w32api/w32api.c:1.8
--- php4/ext/w32api/w32api.c:1.7 Sat Jan 18 19:45:50 2003
+++ php4/ext/w32api/w32api.c Sun Jan 19 03:32:23 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: w32api.c,v 1.7 2003/01/19 00:45:50 iliaa Exp $ */
+/* $Id: w32api.c,v 1.8 2003/01/19 08:32:23 iliaa Exp $ */
/*
* Win32 API Extension for PHP 4
@@ -2178,8 +2178,8 @@
argument_value->type_name = arg_type;
argument_value->type_id = php_w32api_get_type_id_from_name(arg_type);
- if(argument_value->type_id == W32API_UNKNOWN)
- {
+ if(argument_value->type_id == W32API_UNKNOWN) {
+ TSRMLS_FETCH();
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown type %s used as
arugment type", arg_type);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
