summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorSerge Krot <Serge.Krot@cib.de>2015-10-25 14:37:11 +0300
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2015-10-25 22:31:44 +0000
commit0b018d202dfcf4bb16b708e10085a4146243b0a0 (patch)
tree4a00a62a88666944f6e7178ab70c497a090becc2 /bridges
parentce463679a5a362d5c3f7c146f70b6be838ddbb2d (diff)
tdf#39440: fix several warnings reported by cppcheck
Change-Id: I560d28b7cc67740c6479494d0e5aa62d2ac6ffae Reviewed-on: https://gerrit.libreoffice.org/19587 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx2
-rw-r--r--bridges/test/testoffice.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index 167b4ade539f..6e0a7dc72eb3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -385,7 +385,7 @@ namespace
#ifdef BRDEBUG
fprintf(stderr,"cpp_mediate1 gp=%p,fp=%p,ov=%p\n",gpreg,fpreg,ovrflw);
- fprintf(stderr,"gp=%x,%x,%x,%x\n",gpreg[0],gpreg[1],gpreg[2],gpreg[3]);
+ fprintf(stderr,"gp=%p,%p,%p,%p\n",gpreg[0],gpreg[1],gpreg[2],gpreg[3]);
#endif
// gpreg: [ret *], this, [other gpr params]
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 93b10de5f4a6..f0fa890496da 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -377,7 +377,7 @@ void * pRegReturn = &nRegReturn;
// fprintf(stderr,"cpp_mediate nFunctionIndex=%x\n",nFunctionIndex);
// fflush(stderr);
- sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True : sal_False;
+ const sal_Bool bComplex = (nFunctionIndex & 0x80000000) ? sal_True : sal_False;
typelib_TypeClass aType =
cpp_mediate( nFunctionIndex, vTableOffset, pCallStack+17, (sal_Int64*)&nRegReturn );
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 5d17a0045fa2..9e346022ad16 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -112,7 +112,7 @@ void testWriter( const Reference < XComponent > & rCmp )
printf( "pleast type any text\n" );
while( true )
{
- scanf( "%s" , pcText );
+ scanf( "%1023s" , pcText );
if( !strcmp( pcText , "end" ) )
{