summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank M. Kromann <fmk@php.net>2001-03-23 00:58:59 +0000
committerFrank M. Kromann <fmk@php.net>2001-03-23 00:58:59 +0000
commitd7491166c50d82d6308b2f161d4a2fdb0a8cbdf3 (patch)
treef46a189a2da6dc3bf9cc4932b368b3ef4b33a025
parent8bea574877122fbb99af633bf09e825c1b59aa4d (diff)
downloadphp-git-d7491166c50d82d6308b2f161d4a2fdb0a8cbdf3.tar.gz
Removing extra check for warnings.
-rw-r--r--ext/fbsql/php_fbsql.c28
1 files changed, 4 insertions, 24 deletions
diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 7d62b83f11..f1bcf7ceee 100644
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -552,12 +552,12 @@ PHPFBLink* phpfbConnect(INTERNAL_FUNCTION_PARAMETERS, char *hostName, char *user
}
-int phpfbFetchRow (PHPFBResult* result, int row)
+int phpfbFetchRow(PHPFBResult* result, int row)
{
if (result->rowHandler == NULL)
{
- void *rawData = fbcdcFetch(result->connection,result->batchSize,result->fetchHandle);
- if (rawData == NULL)
+ void *rawData = fbcdcFetch(result->connection,result->batchSize,result->fetchHandle);
+ if (rawData == NULL)
result->rowCount = 0;
else
result->rowHandler = fbcrhInitWith(rawData, result->metaData);
@@ -1513,26 +1513,6 @@ PHPFBResult* phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBDatabase*
meta = fbcdcExecuteDirectSQL(database->connection,sql);
- if (fbcmdErrorCount(meta) > 0) {
- FBCErrorMetaData *errorMeta;
- char *errorMessage;
- unsigned error_type = 0;
-
- errorMeta = fbcdcErrorMetaData(database->connection, meta);
- error_type = fbcemdErrorCodeAtIndex(errorMeta, 0);
- errorMessage = fbcemdAllErrorMessages(errorMeta);
- if (error_type != 250) {
- php_error(E_WARNING, "Error executing SQL-statement (%s)", sql);
- }
-// free(errorMessage);
- fbcemdRelease(errorMeta);
-
- if (error_type != 250) {
- fbcmdRelease(meta);
- return NULL;
- }
- }
-
if (fbcmdHasMetaDataArray(meta)) {
sR = fbcmdMetaDataArrayCount(meta);
md = (FBCMetaData*)fbcmdMetaDataAtIndex(meta, cR);
@@ -1540,7 +1520,7 @@ PHPFBResult* phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBDatabase*
else
md = meta;
- ok = mdOk(database,md);
+ ok = mdOk(database, md);
tp = fbcmdStatementType(md);
return_value->value.lval = ok?-1:0;