|
From: <sv...@va...> - 2008-06-10 20:12:54
|
Author: cerion
Date: 2008-06-07 14:29:10 +0100 (Sat, 07 Jun 2008)
New Revision: 417
Log:
Cleanup compiler warnings (patch from Diego Petten?\195?\178)
Modified:
trunk/valkyrie/tool_utils/vglog.cpp
trunk/valkyrie/vk_file_utils.cpp
Modified: trunk/valkyrie/tool_utils/vglog.cpp
===================================================================
--- trunk/valkyrie/tool_utils/vglog.cpp 2006-08-15 15:50:51 UTC (rev 416)
+++ trunk/valkyrie/tool_utils/vglog.cpp 2008-06-07 13:29:10 UTC (rev 417)
@@ -863,7 +863,7 @@
{
VgErrCounts mErrCounts = errorcounts();
- vklmPrint( 2, "--- update matches (n=%d) --- ", sErrors.count());
+ vklmPrint( 2, "--- update matches (n=%zu) --- ", sErrors.count());
/* --- find matches: update master err, delete slave err --- */
@@ -927,7 +927,7 @@
vklmPrint( 2, " ");
}
- vklmPrint( 2, "--- append non-matches (n=%d) --- ", sErrors.count() );
+ vklmPrint( 2, "--- append non-matches (n=%zu) --- ", sErrors.count() );
/* if no errcounts, and sErrors > 0, create empty errcounts */
if ( mErrCounts.isNull() && sErrors.count() > 0 ) {
@@ -965,7 +965,7 @@
bool VgLog::mergeLeakErrors( VgErrorList sLeakErrors )
{
- vklmPrint( 2, "--- update matches (n=%d) ---", sLeakErrors.count() );
+ vklmPrint( 2, "--- update matches (n=%zu) ---", sLeakErrors.count() );
/* --- for each leak in master --- */
VgErrorList errs = leaks();
@@ -1001,7 +1001,7 @@
vklmPrint( 2, " ");
}
- vklmPrint( 2, "--- append non-matches (n=%d) ---", sLeakErrors.count() );
+ vklmPrint( 2, "--- append non-matches (n=%zu) ---", sLeakErrors.count() );
/* --- append remaining slave leaks to master --- */
VgErrorList::Iterator sIt;
Modified: trunk/valkyrie/vk_file_utils.cpp
===================================================================
--- trunk/valkyrie/vk_file_utils.cpp 2006-08-15 15:50:51 UTC (rev 416)
+++ trunk/valkyrie/vk_file_utils.cpp 2008-06-07 13:29:10 UTC (rev 417)
@@ -3021,7 +3021,7 @@
if ( d->paths->hasFocus() )
d->ignoreNextKeyPress = true;
- vkWarn( this, "Error", op->protocolDetail().latin1() );
+ vkWarn( this, "Error", "%s", op->protocolDetail().latin1() );
switch ( op->errorCode() ) {
case QNetworkProtocol::ErrParse:
case QNetworkProtocol::ErrValid:
|