diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-28 19:26:46 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-28 19:26:46 (GMT) |
| commit | 4ed9d39a31d07a9b7ec826287e228321ab05338c (patch) | |
| tree | 29331386ea525ee9d71d6467d252dd2b480a5636 /src/sql/drivers/odbc/qsql_odbc.cpp | |
| parent | 4722183a17ac0074a82a16983a51689642af802b (diff) | |
| parent | c3cdff4ea4d03e8d14f31b10a4d7e80ba0c397c2 (diff) | |
| download | Qt-4ed9d39a31d07a9b7ec826287e228321ab05338c.zip Qt-4ed9d39a31d07a9b7ec826287e228321ab05338c.tar.gz Qt-4ed9d39a31d07a9b7ec826287e228321ab05338c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/sql/drivers/odbc/qsql_odbc.cpp')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index c91aa54..8cff61b 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -223,7 +223,7 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode state_, &nativeCode_, 0, - NULL, + 0, &msgLen); if ((r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) && msgLen > 0) description_.resize(msgLen+1); @@ -400,7 +400,7 @@ static QString qGetStringData(SQLHANDLE hStmt, int column, int colSize, bool uni // colSize-1: remove 0 termination when there is more data to fetch int rSize = (r == SQL_SUCCESS_WITH_INFO) ? colSize : lengthIndicator/sizeof(SQLTCHAR); fieldVal += fromSQLTCHAR(buf, rSize); - if (lengthIndicator < (unsigned int)colSize*sizeof(SQLTCHAR)) { + if ((unsigned)lengthIndicator < colSize*sizeof(SQLTCHAR)) { // workaround for Drivermanagers that don't return SQL_NO_DATA break; } |