diff options
| -rw-r--r-- | ext/dbase/dbf_rec.c | 1 | ||||
| -rw-r--r-- | ext/oci8/oci8.c | 1 | ||||
| -rw-r--r-- | ext/oracle/oracle.c | 2 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 8 | ||||
| -rw-r--r-- | ext/w32api/w32api.c | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/ext/dbase/dbf_rec.c b/ext/dbase/dbf_rec.c index 082e7050f3..928a2bfc0f 100644 --- a/ext/dbase/dbf_rec.c +++ b/ext/dbase/dbf_rec.c @@ -136,6 +136,7 @@ void pack_dbf(dbhead_t *dbh) /* 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."); } diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index a0ea9ff770..32e16f82bc 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -1113,6 +1113,7 @@ oci_get_col(oci_statement *statement, int col, zval **value) { 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; diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index e6acf24e44..41df112f39 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -619,7 +619,7 @@ PHP_FUNCTION(ora_open) } 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)", diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index 3203bd3afb..3ddf457e41 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -407,7 +407,7 @@ static jobjectArray _java_makeArray(int argc, pval** argv TSRMLS_DC) /* {{{ 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 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe efree(arguments); 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(); presult = _java_getset_property(property_reference, 0 TSRMLS_CC); - checkError(&presult); + checkError(&presult TSRMLS_CC); return presult; } /* }}} */ @@ -606,7 +606,7 @@ int java_set_property_handler(zend_property_reference *property_reference, pval 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; } /* }}} */ diff --git a/ext/w32api/w32api.c b/ext/w32api/w32api.c index 8e8e5a34b3..7edd607a2e 100644 --- a/ext/w32api/w32api.c +++ b/ext/w32api/w32api.c @@ -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_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); } |