You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
2.9 KiB
59 lines
2.9 KiB
13 years ago
|
From b2dd236acdef807b51e27692ace5afd82f96585a Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Tardon <dtardon@redhat.com>
|
||
|
|
Date: Tue, 10 Jan 2012 19:32:51 +0100
|
||
|
|
Subject: [PATCH] fix for gcc 4.7/C++11: these are not string literal
|
||
|
|
operators
|
||
|
|
|
||
|
|
---
|
||
|
|
binfilter/bf_sch/source/core/sch_globfunc.cxx | 4 ++--
|
||
|
|
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 4 ++--
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx
|
||
|
|
index 6a81bf1..ac87608 100644
|
||
|
|
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
|
||
|
|
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
|
||
|
|
@@ -1193,7 +1193,7 @@ namespace binfilter {
|
||
|
|
/*N*/ const USHORT* pRanges = rSet.GetRanges();
|
||
|
|
/*N*/ for( long n = 0; pRanges[ n ] && n<32; n+=2 )
|
||
|
|
/*N*/ {
|
||
|
|
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "[%"SAL_PRIdINT32"; %"SAL_PRIdINT32"] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
|
||
|
|
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "[%" SAL_PRIdINT32 "; %" SAL_PRIdINT32 "] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
|
||
|
|
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
|
||
|
|
/*N*/ }
|
||
|
|
/*N*/
|
||
|
|
@@ -1219,7 +1219,7 @@ namespace binfilter {
|
||
|
|
/*N*/ nCns++;
|
||
|
|
/*N*/ if( nCnt < 100 )
|
||
|
|
/*N*/ {
|
||
|
|
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "%"SAL_PRIdINT32", ", (sal_uInt32) nWhich );
|
||
|
|
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "%" SAL_PRIdINT32 ", ", (sal_uInt32) nWhich );
|
||
|
|
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
|
||
|
|
/*N*/ }
|
||
|
|
/*N*/
|
||
|
|
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
|
||
|
|
index f2e9607..ce3ce33 100644
|
||
|
|
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
|
||
|
|
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
|
||
|
|
@@ -1644,7 +1644,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
|
||
|
|
/*N*/ if( pCrypter )
|
||
|
|
/*N*/ {
|
||
|
|
/*?*/ sal_Char buf[ 17 ];
|
||
|
|
-/*?*/ snprintf( buf, sizeof(buf), "%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
|
||
|
|
+/*?*/ snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" SAL_PRIxUINT32, nDate, nTime );
|
||
|
|
/*?*/ rtl::OStringBuffer aTest( buf );
|
||
|
|
/*?*/ pCrypter->Encrypt( aTest );
|
||
|
|
/*?*/ return sal_Bool( !memcmp( cPasswd, aTest.getStr(), PASSWDLEN ) );
|
||
|
|
@@ -1662,7 +1662,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
|
||
|
|
/*N*/ {
|
||
|
|
/*?*/ pCrypter = new Crypter( pRoot->GetKey() );
|
||
|
|
/*?*/ sal_Char buf[ 17 ];
|
||
|
|
-/*?*/ snprintf( buf, sizeof(buf), "%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
|
||
|
|
+/*?*/ snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" SAL_PRIxUINT32, nDate, nTime );
|
||
|
|
/*?*/ rtl::OStringBuffer aTest( buf );
|
||
|
|
/*?*/ pCrypter->Encrypt( aTest );
|
||
|
|
/*?*/ memcpy( cPasswd, aTest.getStr(), aTest.getLength() );
|
||
|
|
--
|
||
|
|
1.7.7.5
|
||
|
|
|