[PHP-CVS] cvs: php4 /ext/fbsql php_fbsql.c

[Frank M. Kromann]

fmk             Thu Mar 22 16:58:59 2001 EDT

  Modified files:              
    /php4/ext/fbsql     php_fbsql.c 
  Log:
  Removing extra check for warnings.
  
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.6 php4/ext/fbsql/php_fbsql.c:1.7
--- php4/ext/fbsql/php_fbsql.c:1.6      Thu Mar 22 13:16:23 2001
+++ php4/ext/fbsql/php_fbsql.c  Thu Mar 22 16:58:59 2001
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_fbsql.c,v 1.6 2001/03/22 21:16:23 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.7 2001/03/23 00:58:59 fmk Exp $ */
 
 /* TODO:
  *
@@ -552,12 +552,12 @@
 }
 
 
-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 @@
 
        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 @@
        else
                md = meta;
 
-       ok     = mdOk(database,md);
+       ok     = mdOk(database, md);
        tp     = fbcmdStatementType(md);
 
        return_value->value.lval = ok?-1:0;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]