Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -179,7 +179,7 @@ bool wxDbConnectInf::AllocHenv()
|
||||
// Initialize the ODBC Environment for Database Operations
|
||||
if (SQLAllocEnv(&Henv) != SQL_SUCCESS)
|
||||
{
|
||||
wxLogDebug(wxT("A problem occured while trying to get a connection to the data source"));
|
||||
wxLogDebug(wxT("A problem occurred while trying to get a connection to the data source"));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1781,16 +1781,16 @@ bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
|
||||
/*
|
||||
* This function is called internally whenever an error condition prevents the user's
|
||||
* request from being executed. This function will query the datasource as to the
|
||||
* actual error(s) that just occured on the previous request of the datasource.
|
||||
* actual error(s) that just occurred on the previous request of the datasource.
|
||||
*
|
||||
* The function will retrieve each error condition from the datasource and
|
||||
* Printf the codes/text values into a string which it then logs via logError().
|
||||
* If in DBDEBUG_CONSOLE mode, the constructed string will be displayed in the console
|
||||
* window and program execution will be paused until the user presses a key.
|
||||
*
|
||||
* This function always returns a false, so that functions which call this function
|
||||
* This function always returns false, so that functions which call this function
|
||||
* can have a line like "return (DispAllErrors(henv, hdbc));" to indicate the failure
|
||||
* of the users request, so that the calling code can then process the error msg log
|
||||
* of the user's request, so that the calling code can then process the error message log.
|
||||
*/
|
||||
{
|
||||
wxString odbcErrMsg;
|
||||
@@ -2507,7 +2507,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
|
||||
* 1) The last array element of the tableName[] argument must be zero (null).
|
||||
* This is how the end of the array is detected.
|
||||
* 2) This function returns an array of wxDbColInf structures. If no columns
|
||||
* were found, or an error occured, this pointer will be zero (null). THE
|
||||
* were found, or an error occurred, this pointer will be zero (null). THE
|
||||
* CALLING FUNCTION IS RESPONSIBLE FOR DELETING THE MEMORY RETURNED WHEN IT
|
||||
* IS FINISHED WITH IT. i.e.
|
||||
*
|
||||
@@ -2597,7 +2597,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
|
||||
NULL, 0); // All columns
|
||||
}
|
||||
if (retcode != SQL_SUCCESS)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
if (colInf)
|
||||
delete [] colInf;
|
||||
@@ -2655,7 +2655,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
|
||||
}
|
||||
}
|
||||
if (retcode != SQL_NO_DATA_FOUND)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
if (colInf)
|
||||
delete [] colInf;
|
||||
@@ -2753,7 +2753,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wx
|
||||
NULL, 0); // All columns
|
||||
}
|
||||
if (retcode != SQL_SUCCESS)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
if (colInf)
|
||||
delete [] colInf;
|
||||
@@ -2829,7 +2829,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wx
|
||||
}
|
||||
}
|
||||
if (retcode != SQL_NO_DATA_FOUND)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
if (colInf)
|
||||
delete [] colInf;
|
||||
@@ -3009,7 +3009,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
|
||||
NULL, 0); // All columns
|
||||
}
|
||||
if (retcode != SQL_SUCCESS)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
if (colInf)
|
||||
delete [] colInf;
|
||||
@@ -3105,7 +3105,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
|
||||
}
|
||||
}
|
||||
if (retcode != SQL_NO_DATA_FOUND)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
if (colInf)
|
||||
delete [] colInf;
|
||||
@@ -3257,7 +3257,7 @@ int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
|
||||
NULL, 0); // All columns
|
||||
}
|
||||
if (retcode != SQL_SUCCESS)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
SQLFreeStmt(hstmt, SQL_CLOSE);
|
||||
return(-1);
|
||||
@@ -3268,7 +3268,7 @@ int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
|
||||
noCols++;
|
||||
|
||||
if (retcode != SQL_NO_DATA_FOUND)
|
||||
{ // Error occured, abort
|
||||
{ // Error occurred, abort
|
||||
DispAllErrors(henv, hdbc, hstmt);
|
||||
SQLFreeStmt(hstmt, SQL_CLOSE);
|
||||
return(-1);
|
||||
@@ -3289,7 +3289,7 @@ wxDbInf *wxDb::GetCatalog(const wxChar *userID)
|
||||
* -- : uses SQLTables and fills pTableInf; ------
|
||||
* -- : pColInf is set to NULL and numCols to 0; ------
|
||||
* -- : returns pDbInf (wxDbInf) ------
|
||||
* -- - if unsuccesfull (pDbInf == NULL) ------
|
||||
* -- - if unsuccessful (pDbInf == NULL) ------
|
||||
* -- : pColInf can be filled with GetColumns(..); ------
|
||||
* -- : numCols can be filled with GetColumnCount(..); ------
|
||||
* ---------------------------------------------------------------------
|
||||
@@ -4333,7 +4333,7 @@ int wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const
|
||||
// embedded nulls in strings
|
||||
setupStr.Printf(wxT("DSN=%s%cDescription=%s%cDefaultDir=%s%c"),dsn,2,description,2,defDir,2);
|
||||
|
||||
// Replace the separator from above with the '\0' seperator needed
|
||||
// Replace the separator from above with the '\0' separator needed
|
||||
// by the SQLConfigDataSource() function
|
||||
int k;
|
||||
do
|
||||
@@ -4415,7 +4415,7 @@ bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMaxLength, wxChar *DsDes
|
||||
********************************************************************
|
||||
*
|
||||
* The following functions are all DEPRECATED and are included for
|
||||
* backward compatability reasons only
|
||||
* backward compatibility reasons only
|
||||
*
|
||||
********************************************************************
|
||||
********************************************************************/
|
||||
|
||||
Reference in New Issue
Block a user