Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch #926140: "warning cleaning"

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-04-06 15:34:53 +00:00
parent d1f4723592
commit caf412d6f2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/db.cpp
View File

@@ -596,6 +596,8 @@ bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthSt
cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl; cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl;
else else
cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl; cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl;
#else
wxUnusedVar( retcode );
#endif #endif
} }
@@ -798,6 +800,8 @@ bool wxDb::Open(wxDb *copyDb)
cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl; cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl;
else else
cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl; cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl;
#else
wxUnusedVar( retcode );
#endif #endif
} }
@@ -2194,7 +2198,6 @@ int wxDb::GetKeyFields(const wxString &tableName, wxDbColInf* colInf, UWORD noCo
/* primary keys in other tables that are referred to by foreign */ /* primary keys in other tables that are referred to by foreign */
/* keys in the tableName table. */ /* keys in the tableName table. */
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
i = 0;
while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO)) while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
{ {
retcode = SQLFetch(hstmt); retcode = SQLFetch(hstmt);
@@ -3012,7 +3015,6 @@ wxDbInf *wxDb::GetCatalog(const wxChar *userID)
* to avoid undesired unbinding of columns. * to avoid undesired unbinding of columns.
*/ */
{ {
wxDbInf *pDbInf = NULL; // Array of catalog entries
int noTab = 0; // Counter while filling table entries int noTab = 0; // Counter while filling table entries
int pass; int pass;
RETCODE retcode; RETCODE retcode;
@@ -3023,7 +3025,10 @@ wxDbInf *wxDb::GetCatalog(const wxChar *userID)
convertUserID(userID,UserID); convertUserID(userID,UserID);
//------------------------------------------------------------- //-------------------------------------------------------------
pDbInf = new wxDbInf; // Create the Database Array // Create the Database Array of catalog entries
wxDbInf *pDbInf = new wxDbInf;
//------------------------------------------------------------- //-------------------------------------------------------------
// Table Information // Table Information
// Pass 1 - Determine how many Tables there are. // Pass 1 - Determine how many Tables there are.
@@ -3801,7 +3806,7 @@ wxDb WXDLLIMPEXP_ODBC *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnly
pList->PtrDb = new wxDb(pDbConfig->GetHenv(), FwdOnlyCursors); pList->PtrDb = new wxDb(pDbConfig->GetHenv(), FwdOnlyCursors);
bool opened = FALSE; bool opened;
if (!matchingDbConnection) if (!matchingDbConnection)
opened = pList->PtrDb->Open(pDbConfig->GetDsn(), pDbConfig->GetUserID(), pDbConfig->GetPassword()); opened = pList->PtrDb->Open(pDbConfig->GetDsn(), pDbConfig->GetUserID(), pDbConfig->GetPassword());