[Libreoffice-commits] core.git: dtrans/source sal/osl

[Stephan Bergmann]

 dtrans/source/win32/dtobj/DataFmtTransl.cxx |2 +-
 sal/osl/w32/interlck.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 186eda28ffbcd9ed918b2cf7f3d7bd294575
Author: Stephan Bergmann 
Date:   Tue Aug 22 08:38:48 2017 +0200

loplugin:unnecessaryparen (clang-cl)

Change-Id: I61b006051e708636f0bba83b16de36f4571b8da7

diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx 
b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index a498e9d4471e..c35cc42f43a6 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -231,7 +231,7 @@ bool SAL_CALL CDataFormatTranslator::isHTMLFormat( 
CLIPFORMAT cf )
 bool SAL_CALL CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf )
 {
 OUString clipFormatName = getClipboardFormatName( cf );
-return ( clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE ) 
);
+return clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE );
 }
 
 OUString SAL_CALL CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, 
CLIPFORMAT aClipformat )
diff --git a/sal/osl/w32/interlck.cxx b/sal/osl/w32/interlck.cxx
index 3866062d75c2..b9ecf6d78eef 100644
--- a/sal/osl/w32/interlck.cxx
+++ b/sal/osl/w32/interlck.cxx
@@ -23,12 +23,12 @@
 
 oslInterlockedCount SAL_CALL 
osl_incrementInterlockedCount(oslInterlockedCount* pCount)
 {
-return (InterlockedIncrement(pCount));
+return InterlockedIncrement(pCount);
 }
 
 oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInterlockedCount* pCount)
 {
-return (InterlockedDecrement(pCount));
+return InterlockedDecrement(pCount);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dtrans/source sal/osl

[Jochen Nitschke]

 dtrans/source/cnttype/wbench/testcnttype.cxx |2 +-
 sal/osl/unx/process.cxx  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 90891602fc826d11985910fc8e892706cd419539
Author: Jochen Nitschke 
Date:   Tue May 17 09:55:13 2016 +0200

limit scanf string field width

Change-Id: I9070bae914d923171b6eaf8209de00922dc87be7
Reviewed-on: https://gerrit.libreoffice.org/25052
Tested-by: Jenkins 
Reviewed-by: Jochen Nitschke 

diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx 
b/dtrans/source/cnttype/wbench/testcnttype.cxx
index f6482c2..b4cfb7a 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -71,7 +71,7 @@ sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< 
string >& vecData
 fseek( fstream, 0L, SEEK_SET );
 
 char line[1024];
-while ( fscanf( fstream, "%[^\n]s", line ) != EOF )
+while ( fscanf( fstream, "%1023[^\n]s", line ) != EOF )
 {
 vecData.push_back( line );
 fgetc( fstream );
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 391b160..4d372a3 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -899,7 +899,7 @@ bool osl_getProcStat(pid_t pid, struct osl_procStat* 
procstat)
"%lu %li %li %li"
"%lu %lu %li %lu"
"%lu %lu %lu %lu %lu"
-   "%s %s %s %s"
+   "%23s %23s %23s %23s"
"%lu %lu %lu",
>state,
>ppid,  >pgrp,>session,   
 >tty, >tpgid,
@@ -975,7 +975,7 @@ bool osl_getProcStatus(pid_t pid, struct osl_procStat* 
procstat)
 tmp = strstr(prstatusbuf,"SigPnd:");
 if(tmp)
 {
-sscanf(tmp, "SigPnd: %s SigBlk: %s SigIgn: %s %*s %s",
+sscanf(tmp, "SigPnd: %23s SigBlk: %23s SigIgn: %23s %*s %23s",
procstat->signal, procstat->blocked, procstat->sigignore, 
procstat->sigcatch
 );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits