1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
Index: valkyrie-1.2.0/valkyrie/tool_utils/vglog.cpp
===================================================================
--- valkyrie-1.2.0.orig/valkyrie/tool_utils/vglog.cpp
+++ valkyrie-1.2.0/valkyrie/tool_utils/vglog.cpp
@@ -863,7 +863,7 @@ bool VgLog::mergeErrors( VgErrorList sEr
{
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 @@ bool VgLog::mergeErrors( VgErrorList sEr
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::mergeErrors( VgErrorList sEr
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 @@ bool VgLog::mergeLeakErrors( VgErrorList
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;
Index: valkyrie-1.2.0/valkyrie/vk_file_utils.cpp
===================================================================
--- valkyrie-1.2.0.orig/valkyrie/vk_file_utils.cpp
+++ valkyrie-1.2.0/valkyrie/vk_file_utils.cpp
@@ -3021,7 +3021,7 @@ void FileDialog::urlFinished( QNetworkOp
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:
|
GitWeb
