[Libreoffice-commits] .: guw/guw.cc soltools/checkdll soltools/ldump soltools/mkdepend soltools/testSHL

[David Tardon]

 guw/guw.cc                              |    2 +-
 soltools/checkdll/checkdll.c            |    3 +--
 soltools/ldump/ldump.cxx                |    1 +
 soltools/mkdepend/collectdircontent.cxx |    1 +
 soltools/testSHL/inc/tstMgr.hxx         |    2 +-
 soltools/testSHL/util/tlog.cxx          |    1 -
 6 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4054a795adc53245c52f9c8e39360bbc94a7f69c
Author: Guillaume Poussel <gpoussel at gmail.com>
Date:   Tue Jan 4 22:40:36 2011 +0100

    Removing few cppchecks warnings.

diff --git a/guw/guw.cc b/guw/guw.cc
index ef6e5eb..a3a2f86 100644
--- a/guw/guw.cc
+++ b/guw/guw.cc
@@ -290,7 +290,7 @@ void init_ignorepara(string fullcommand) {
 bool is_ignorepara(const string &para) {
 
   for( vector<string>::iterator it = ignorepara_vec.begin();
-       it != ignorepara_vec.end(); it++ ) {
+       it != ignorepara_vec.end(); ++it ) {
     if ( para.find(*it) != string::npos ) {
       if ( debug )
         cerr << "Found execption para: " << para << endl;
diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c
index 1b5b89c..8aaf053 100644
--- a/soltools/checkdll/checkdll.c
+++ b/soltools/checkdll/checkdll.c
@@ -51,7 +51,6 @@ void usage()
 
 int main(int argc, char *argv[])
 {
-    int 	rc;
     int     silent=0;
     void	*phandle;	
     char 	*(*pfun)(void);
@@ -66,7 +65,7 @@ int main(int argc, char *argv[])
         ++argv, --argc;
     }
 
-    if ( (rc = access( argv[1], R_OK )) == -1 ) {
+    if ( access( argv[1], R_OK ) == -1 ) {
         fprintf(stderr, "%s: ERROR: %s: %s\n",
                 pprog_name, argv[1], strerror(errno));
         return 2;
diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx
index 28ea50b..31b516d 100644
--- a/soltools/ldump/ldump.cxx
+++ b/soltools/ldump/ldump.cxx
@@ -755,6 +755,7 @@ main( int argc, char **argv )
     pDump->PrintDefFile();
     pDump->PrintDataBase();
     delete pDump;
+    delete [] pLibName;
     return 0;
 }
 
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index ca73428..60654bd 100644
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -42,6 +42,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) {
     while ((pent = readdir(pdir))) {
         dirContent.insert(pent->d_name);
     };
+    closedir(pdir);
 #endif // defined( WNT )
     allIncludes.insert(EntriesPair(dirPath, dirContent));
 };
diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx
index 2740c7a..d3c8687 100644
--- a/soltools/testSHL/inc/tstMgr.hxx
+++ b/soltools/testSHL/inc/tstMgr.hxx
@@ -50,7 +50,7 @@ class tstMgr {
     // </private_methods>
 
 public:
-
+    tstMgr() : pImpl(0) {}
     // <dtor>
     ~tstMgr(){
         cleanup();
diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx
index 366e667..c6d475d 100644
--- a/soltools/testSHL/util/tlog.cxx
+++ b/soltools/testSHL/util/tlog.cxx
@@ -93,7 +93,6 @@ void tLog::initialize( const ::rtl::OString& name ) {
     }
     sal_uInt64 uBytes=0;
     sal_uInt32 len = ln( buf );
-    const sal_Char* ptr = buf;
 
     if ( v ) {
         fprintf( stderr, "%s", buf );