Skip to content

Commit

Permalink
some warnings are cleaned
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexpotapchenko
alexpotapchenko committed Jan 4, 2019
1 parent 50b0ecd commit 09171ba
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions IscDbc/IscArray.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ void IscArray::getBytesFromArray()
isc_tr_handle transactionHandle = statement->startTransaction();
ISC_LONG lenbuf = arrBufDataSize;

int ret = connection->GDS->_array_get_slice(statusVector, &connection->databaseHandle, &transactionHandle,
ISC_STATUS ret = connection->GDS->_array_get_slice(statusVector, &connection->databaseHandle, &transactionHandle,
arrayId, &arrDesc, arrBufData, &lenbuf);

if ( ret )
Expand Down Expand Up @@ -722,7 +722,7 @@ void IscArray::writeArray(Value * value)

memset( arrayId, 0, sizeof ( ISC_QUAD ));

int ret = connection->GDS->_array_put_slice(statusVector, &connection->databaseHandle, &transactionHandle,
ISC_STATUS ret = connection->GDS->_array_put_slice(statusVector, &connection->databaseHandle, &transactionHandle,
arrayId, &arrDesc, arrBufData, &lenbuf);
if (ret || lenbuf != arrBufDataSize)
THROW_ISC_EXCEPTION (connection, statusVector);
Expand Down
10 changes: 5 additions & 5 deletions IscDbc/IscBlob.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void IscBlob::fetchBlob()
isc_tr_handle transactionHandle = statement->startTransaction();
isc_blob_handle blobHandle = NULL;

int ret = connection->GDS->_open_blob2 (statusVector, &connection->databaseHandle, &transactionHandle,
ISC_STATUS ret = connection->GDS->_open_blob2 (statusVector, &connection->databaseHandle, &transactionHandle,
&blobHandle, &blobId, 0, NULL);

if (ret)
Expand All @@ -132,7 +132,7 @@ void IscBlob::fetchBlob()

for (;;)
{
int ret = connection->GDS->_get_segment (statusVector, &blobHandle, &length, sizeof (buffer), buffer);
ISC_STATUS ret = connection->GDS->_get_segment (statusVector, &blobHandle, &length, sizeof (buffer), buffer);
if (ret)
if (ret == isc_segstr_eof)
break;
Expand Down Expand Up @@ -298,7 +298,7 @@ void IscBlob::directOpenBlob( char * sqldata )
GDS->_close_blob (statusVector, &directBlobHandle);

isc_tr_handle transactionHandle = statement->startTransaction();
int ret = GDS->_open_blob2 (statusVector, &connection->databaseHandle, &transactionHandle,
ISC_STATUS ret = GDS->_open_blob2 (statusVector, &connection->databaseHandle, &transactionHandle,
&directBlobHandle, (ISC_QUAD*) sqldata, 0, NULL);
if (ret)
THROW_ISC_EXCEPTION (connection, statusVector);
Expand Down Expand Up @@ -332,7 +332,7 @@ bool IscBlob::directFetchBlob( char * bufData, int lenData, int &lenRead )
CFbDll * GDS = connection->GDS;
int post = lenData > DEFAULT_BLOB_BUFFER_LENGTH ? DEFAULT_BLOB_BUFFER_LENGTH : lenData;
char *data = bufData;
int ret;
ISC_STATUS ret;

while ( lenData )
{
Expand Down Expand Up @@ -371,7 +371,7 @@ bool IscBlob::directGetSegmentToHexStr( char * bufData, int lenData, int &lenRea
CFbDll * GDS = connection->GDS;
int post = lenData > DEFAULT_BLOB_BUFFER_LENGTH ? DEFAULT_BLOB_BUFFER_LENGTH : lenData;
char *data = bufData;
int ret;
ISC_STATUS ret;

while ( lenData )
{
Expand Down
6 changes: 3 additions & 3 deletions IscDbc/IscResultSet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ bool IscResultSet::nextFetch()
ISC_STATUS statusVector [20];

int dialect = statement->connection->getDatabaseDialect ();
int ret = statement->connection->GDS->_dsql_fetch (statusVector, &statement->statementHandle, dialect, *sqlda);
ISC_STATUS ret = statement->connection->GDS->_dsql_fetch (statusVector, &statement->statementHandle, dialect, *sqlda);

if (ret)
{
Expand All @@ -128,7 +128,7 @@ bool IscResultSet::next()
ISC_STATUS statusVector [20];

int dialect = statement->connection->getDatabaseDialect ();
int ret = statement->connection->GDS->_dsql_fetch (statusVector, &statement->statementHandle, dialect, *sqlda);
ISC_STATUS ret = statement->connection->GDS->_dsql_fetch (statusVector, &statement->statementHandle, dialect, *sqlda);

if (ret)
{
Expand Down Expand Up @@ -181,7 +181,7 @@ bool IscResultSet::readStaticCursor()

int dialect = statement->connection->getDatabaseDialect ();
CFbDll * GDS = statement->connection->GDS;
int ret;
ISC_STATUS ret;

sqlda->initStaticCursor ( statement );

Expand Down
4 changes: 2 additions & 2 deletions IscDbc/SQLError.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ SQLError::operator const char* ()
return getText();
}

SQLError::SQLError( int code, int codefb, const char * txt, ...)
SQLError::SQLError( int code, __int64 codefb, const char * txt, ...)
{
va_list args;
va_start (args, txt);
Expand All @@ -190,7 +190,7 @@ SQLError::SQLError( int code, int codefb, const char * txt, ...)

text = temp;
sqlcode = (int) code;
fbcode = codefb;
fbcode = (int) codefb;
}

const char* SQLError::getTrace()
Expand Down
2 changes: 1 addition & 1 deletion IscDbc/SQLError.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class SQLError : public SQLException
virtual int release();
virtual void addRef();
virtual const char* getTrace();
SQLError (int sqlcode, int fbcode, const char *text, ...);
SQLError (int sqlcode, __int64 fbcode, const char *text, ...);
SQLError (SqlCode sqlcode, const char *text, ...);
SQLError (Stream *trace, SqlCode code, const char *txt,...);
~SQLError() throw();
Expand Down

0 comments on commit 09171ba

Please sign in to comment.