archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ZTS fixes.

Browse source
This commit is contained in:
Ilia Alshanetsky 2003-01-19 08:32:26 +00:00
parent 2500199ae3
commit 1fe4990bc0
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/dbase/dbf_rec.c
View file

@ -136,6 +136,7 @@ void pack_dbf(dbhead_t *dbh)
/* Try to truncate the file to the right size. */ /* Try to truncate the file to the right size. */
if (ftruncate(dbh->db_fd, out_off) != 0) { 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."); 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.");
} }

1
ext/oci8/oci8.c
View file

@ -1113,6 +1113,7 @@ oci_get_col(oci_statement *statement, int col, zval **value)
{ {
oci_out_column *outcol = NULL; oci_out_column *outcol = NULL;
int i; int i;
TSRMLS_FETCH();
if (statement->columns == 0) { /* we release the columns at the end of a fetch */ if (statement->columns == 0) { /* we release the columns at the end of a fetch */
return NULL; return NULL;

2
ext/oracle/oracle.c
View file

@ -619,7 +619,7 @@ PHP_FUNCTION(ora_open)
} }
ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); 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)); memset(cursor, 0, sizeof(oraCursor));
if (oopen(&cursor->cda, &conn->lda, (text *) 0, -1, -1, (text *) 0, -1)) { 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)", php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open new cursor (%s)",

8
ext/rpc/java/java.c
View file

@ -407,7 +407,7 @@ static jobjectArray _java_makeArray(int argc, pval** argv TSRMLS_DC)
/* {{{ checkError /* {{{ checkError
*/ */
static int checkError(pval *value) static int checkError(pval *value TSRMLS_DC)
{ {
if (Z_TYPE_P(value) == IS_EXCEPTION) { if (Z_TYPE_P(value) == IS_EXCEPTION) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", Z_STRVAL_P(value)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", Z_STRVAL_P(value));
@ -493,7 +493,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
efree(arguments); efree(arguments);
pval_destructor(&function_name->element); pval_destructor(&function_name->element);
checkError((pval*)(long)result); checkError((pval*)(long)result TSRMLS_CC);
} }
/* }}} */ /* }}} */
@ -593,7 +593,7 @@ pval java_get_property_handler(zend_property_reference *property_reference)
TSRMLS_FETCH(); TSRMLS_FETCH();
presult = _java_getset_property(property_reference, 0 TSRMLS_CC); presult = _java_getset_property(property_reference, 0 TSRMLS_CC);
checkError(&presult); checkError(&presult TSRMLS_CC);
return presult; return presult;
} }
/* }}} */ /* }}} */
@ -606,7 +606,7 @@ int java_set_property_handler(zend_property_reference *property_reference, pval
TSRMLS_FETCH(); TSRMLS_FETCH();
presult = _java_getset_property(property_reference, _java_makeArray(1, &value TSRMLS_CC) TSRMLS_CC); 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;
} }
/* }}} */ /* }}} */

4
ext/w32api/w32api.c
View file

@ -2178,8 +2178,8 @@ arguments *w32api_parser_make_argument(char *arg_type, char *arg_name, int byref
argument_value->type_name = arg_type; argument_value->type_name = arg_type;
argument_value->type_id = php_w32api_get_type_id_from_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_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown type %s used as arugment type", arg_type);
} }