summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-24 12:43:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-24 13:06:49 +0100
commit5f64aba978b117eb4372fef913823243a800fbea (patch)
treef1a47cfbb74580f5206819ebbf032870671bbd90
parent97839c6768f09684bfd0d39322896f65b68f8549 (diff)
cppcheck: invalidPrintfArgType_sint
Change-Id: I4103c8e1549db44055fbfcb8ced6ec36d27fc126
-rw-r--r--rsc/source/rscpp/cpp5.c2
-rw-r--r--sw/source/core/bastyp/calc.cxx4
-rw-r--r--vcl/source/fontsubset/sft.cxx2
-rw-r--r--vcl/source/gdi/sallayout.cxx6
4 files changed, 7 insertions, 7 deletions
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 499219ba6e7f..1f73ff350e01 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -241,7 +241,7 @@ again:
else
{
#ifdef DEBUG_EVAL
- fprintf( pCppOut, "pushing %d onto value stack[%d]\n",
+ fprintf( pCppOut, "pushing %d onto value stack[%u]\n",
evalue, valp - value);
#endif
*valp++ = evalue;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 7473c41cca27..1f4dc62ce64f 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1666,7 +1666,7 @@ void main()
for( int n = 0; n < 27; ++n )
{
- unsigned long ii = 0;
+ unsigned int ii = 0;
const sal_Char* pp = sNTypeTab[ n ];
while( *pp )
@@ -1677,7 +1677,7 @@ void main()
ch = aArr[ ii ] ? 'X' : ' ';
aArr[ ii ] = 1;
- printf( "%-20s -> %3d [%c]\n", sNTypeTab[ n ], ii, ch );
+ printf( "%-20s -> %3u [%c]\n", sNTypeTab[ n ], ii, ch );
}
}
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 51f3f957ddea..7461f56b80d5 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2343,7 +2343,7 @@ int CreateT42FromTTGlyphs(TrueTypeFont *ttf,
fprintf(outf, " 0 1 255 {Encoding exch /.notdef put} for\n");
for (i = 1; i<nGlyphs; i++) {
- fprintf(outf, "Encoding %d /glyph%d put\n", encoding[i], gID[i]);
+ fprintf(outf, "Encoding %d /glyph%u put\n", encoding[i], gID[i]);
}
fprintf(outf, "/XUID [103 0 1 16#%08X %d 16#%08X 16#%08X] def\n", (unsigned int)rtl_crc32(0, ttf->ptr, ttf->fsize), (unsigned int)nGlyphs, (unsigned int)rtl_crc32(0, glyphArray, nGlyphs * 2), (unsigned int)rtl_crc32(0, encoding, nGlyphs));
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 6becfe772b6c..e351deb77eee 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1624,7 +1624,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
nValid[ nLevel ] = mpLayouts[n]->GetNextGlyphs( 1, &nDummy, aPos,
nStartNew[ nLevel ], &nGlyphAdv[ nLevel ], &nCharPos[ nLevel ] );
#ifdef MULTI_SL_DEBUG
- if (nValid[nLevel]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d x%d a%d c%d %x\n", n, nStartOld[nLevel], nStartNew[nLevel], aPos.X(), (long)nGlyphAdv[nLevel], nCharPos[nLevel],
+ if (nValid[nLevel]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d x%d a%d c%ld %x\n", n, nStartOld[nLevel], nStartNew[nLevel], aPos.X(), (long)nGlyphAdv[nLevel], nCharPos[nLevel],
rArgs.mrStr[nCharPos[nLevel]]);
#endif
if( (n > 0) && !nValid[ nLevel ] )
@@ -1695,7 +1695,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
nValid[0] = mpLayouts[0]->GetNextGlyphs( 1, &nDummy, aPos,
nStartNew[0], &nGlyphAdv[0], &nCharPos[0] );
#ifdef MULTI_SL_DEBUG
- if (nValid[0]) fprintf(mslLog(), "layout[0]->GetNextGlyphs %d,%d x%d a%d c%d %x\n", nStartOld[0], nStartNew[0], aPos.X(), (long)nGlyphAdv[0], nCharPos[0], rArgs.mrStr[nCharPos[0]]);
+ if (nValid[0]) fprintf(mslLog(), "layout[0]->GetNextGlyphs %d,%d x%d a%ld c%d %x\n", nStartOld[0], nStartNew[0], aPos.X(), (long)nGlyphAdv[0], nCharPos[0], rArgs.mrStr[nCharPos[0]]);
#endif
if( !nValid[0] )
break;
@@ -1715,7 +1715,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
nValid[n] = mpLayouts[n]->GetNextGlyphs( 1, &nDummy, aPos,
nStartNew[n], &nGlyphAdv[n], &nCharPos[n] );
#ifdef MULTI_SL_DEBUG
- if (nValid[n]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d a%d c%d %x\n", n, nStartOld[n], nStartNew[n], (long)nGlyphAdv[n], nCharPos[n], rArgs.mrStr[nCharPos[n]]);
+ if (nValid[n]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d a%ld c%d %x\n", n, nStartOld[n], nStartNew[n], (long)nGlyphAdv[n], nCharPos[n], rArgs.mrStr[nCharPos[n]]);
#endif
// break after last glyph of active layout
if( !nValid[n] )