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

some warnings fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-21 18:12:17 +00:00
parent 1457c9030c
commit da38429d93
1 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/dbtable.cpp
View File

@@ -2082,12 +2082,15 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN) if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
{ {
int assertColumnNameTooLong = 0;
wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN); wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0; colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;
#ifdef __WXDEBUG__
wxString tmpMsg; wxString tmpMsg;
tmpMsg.Printf("Column name '%s' is too long. Truncated to '%s'.",fieldName.c_str(),colDefs[index].ColName); tmpMsg.Printf(_T("Column name '%s' is too long. Truncated to '%s'."),
wxASSERT_MSG(assertColumnNameTooLong,tmpMsg.c_str()); fieldName.c_str(),colDefs[index].ColName);
wxFAIL_MSG(tmpMsg);
#endif // __WXDEBUG__
} }
else else
wxStrcpy(colDefs[index].ColName, fieldName); wxStrcpy(colDefs[index].ColName, fieldName);
@@ -2173,8 +2176,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
pColDataPtrs[index].SqlCtype = SQL_C_TIMESTAMP; pColDataPtrs[index].SqlCtype = SQL_C_TIMESTAMP;
break; break;
case DB_DATA_TYPE_BLOB: case DB_DATA_TYPE_BLOB:
int notSupportedYet = 0; wxFAIL_MSG(wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));
wxASSERT_MSG(notSupportedYet, wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));
pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL; pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
pColDataPtrs[index].SzDataObj = /*BLOB ADDITION NEEDED*/sizeof(void *); pColDataPtrs[index].SzDataObj = /*BLOB ADDITION NEEDED*/sizeof(void *);
pColDataPtrs[index].SqlCtype = SQL_VARBINARY; pColDataPtrs[index].SqlCtype = SQL_VARBINARY;