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

fix gcc warnings about in printf format (partly modified patch 1500717)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-06-25 23:47:50 +00:00
parent 669c595daf
commit d595fb29c9
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/db.cpp
View File

@@ -1755,8 +1755,9 @@ void wxDb::Close(void)
tiu = (wxTablesInUse *)pNode->GetData(); tiu = (wxTablesInUse *)pNode->GetData();
if (tiu->pDb == this) if (tiu->pDb == this)
{ {
s.Printf(wxT("(%-20s) tableID:[%6lu] pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb); s.Printf(wxT("(%-20s) tableID:[%6lu] pDb:[%p]"),
s2.Printf(wxT("Orphaned table found using pDb:[%p]"),this); tiu->tableName, tiu->tableID, wx_static_cast(void*, tiu->pDb));
s2.Printf(wxT("Orphaned table found using pDb:[%p]"), wx_static_cast(void*, this));
wxLogDebug(s.c_str(),s2.c_str()); wxLogDebug(s.c_str(),s2.c_str());
} }
pNode = pNode->GetNext(); pNode = pNode->GetNext();

6
src/common/dbtable.cpp
View File

@@ -186,7 +186,8 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
wxString s; wxString s;
tableID = ++lastTableID; tableID = ++lastTableID;
s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"), tblName.c_str(), tableID, pDb); s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"),
tblName.c_str(), tableID, wx_static_cast(void*, pDb));
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
wxTablesInUse *tableInUse; wxTablesInUse *tableInUse;
@@ -309,7 +310,8 @@ void wxDbTable::cleanup()
wxString s; wxString s;
if (pDb) if (pDb)
{ {
s.Printf(wxT("wxDbTable destructor (%-20s) tableID:[%6lu] pDb:[%p]"), tableName.c_str(), tableID, pDb); s.Printf(wxT("wxDbTable destructor (%-20s) tableID:[%6lu] pDb:[%p]"),
tableName.c_str(), tableID, wx_static_cast(void*, pDb));
pDb->WriteSqlLog(s); pDb->WriteSqlLog(s);
} }

6
src/common/fileconf.cpp
View File

@@ -1650,12 +1650,12 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
wxLogTrace( FILECONF_TRACE_MASK, wxLogTrace( FILECONF_TRACE_MASK,
_T(" (m_pLine) = prev: %p, this %p, next %p"), _T(" (m_pLine) = prev: %p, this %p, next %p"),
((m_pLine) ? m_pLine->Prev() : 0), m_pLine ? m_pLine->Prev() : NULL,
m_pLine, m_pLine,
((m_pLine) ? m_pLine->Next() : 0) ); m_pLine ? m_pLine->Next() : NULL );
wxLogTrace( FILECONF_TRACE_MASK, wxLogTrace( FILECONF_TRACE_MASK,
_T(" text: '%s'"), _T(" text: '%s'"),
((m_pLine) ? m_pLine->Text().c_str() : wxEmptyString) ); m_pLine ? m_pLine->Text().c_str() : wxEmptyString );
// delete all entries... // delete all entries...
size_t nCount = pGroup->m_aEntries.Count(); size_t nCount = pGroup->m_aEntries.Count();

2
src/common/variant.cpp
View File

@@ -985,7 +985,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
bool wxVariantDataWxObjectPtr::Write(wxString& str) const bool wxVariantDataWxObjectPtr::Write(wxString& str) const
{ {
str.Printf(wxT("%s(%p)"), GetType().c_str(), m_value); str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value));
return true; return true;
} }