Merge pull request #27 from jwillemsen/master

Suppress valgrind reported conditional jumps in grep and fixed a few Coverity reported errors

3 files changed, 49 insertions, 42 deletions

diff --git a/ACE/bin/valgrind.supp b/ACE/bin/valgrind.supp
index 6322f2c9401..f5fa8a33f0f 100644
--- a/ACE/bin/valgrind.supp
+++ b/ACE/bin/valgrind.supp
@@ -35,6 +35,13 @@
 }
 
 {
+   <Suppress all the conditional jumps in grep>
+   Memcheck:Cond
+   ...
+   obj:*/bin/grep
+}
+
+{
    <Suppress all the leaks in ps>
    Memcheck:Leak
    ...
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index 81d89e1e159..ef38733e838 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -118,7 +118,7 @@
           </ul>
           If you want to perform a full build with qt support, than run:
           <ul>
-            <li><code>yum install bison libxerces-c-devel psmisc yum-utils gdb unzip glibc-devel libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git telnet GitPython NetworkManager wget mailx</code></li>
+            <li><code>yum install rubygem-rmagick bison libxerces-c-devel psmisc yum-utils gdb unzip glibc-devel libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git telnet GitPython NetworkManager wget mailx</code></li>
           </ul>
           For some optional i686 packages run
           <ul>
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 0e9321ab8c9..bc9d38bc388 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -37,10 +37,10 @@ TAO_EC_Per_Supplier_Filter::bind (TAO_EC_ProxyPushConsumer* consumer)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  if (this->consumer_ != 0)
-    return;
-
-  this->consumer_ = consumer;
+  if (this->consumer_ == 0)
+    {
+      this->consumer_ = consumer;
+    }
 }
 
 void
@@ -68,34 +68,34 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  if (this->consumer_ == 0)
-    return;
-
-  const RtecEventChannelAdmin::SupplierQOS& pub =
-    this->consumer_->publications_i ();
-
-  for (CORBA::ULong j = 0; j < pub.publications.length (); ++j)
+  if (this->consumer_ != 0)
     {
-      const RtecEventComm::Event& event =
-        pub.publications[j].event;
+      const RtecEventChannelAdmin::SupplierQOS& pub =
+        this->consumer_->publications_i ();
+
+      for (CORBA::ULong j = 0; j < pub.publications.length (); ++j)
+        {
+          const RtecEventComm::Event& event =
+            pub.publications[j].event;
 
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
-      ORBSVCS_DEBUG ((LM_DEBUG, "Connecting consumer <%x> to <%x>, "
-                  "trying event <%d:%d>  ",
-                  supplier, this,
-                  event.header.source, event.header.type));
+          ORBSVCS_DEBUG ((LM_DEBUG, "Connecting consumer <%x> to <%x>, "
+                      "trying event <%d:%d>  ",
+                      supplier, this,
+                      event.header.source, event.header.type));
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
-      if (supplier->can_match (event.header))
-        {
+          if (supplier->can_match (event.header))
+            {
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
-          ORBSVCS_DEBUG ((LM_DEBUG, "  matched\n"));
+              ORBSVCS_DEBUG ((LM_DEBUG, "  matched\n"));
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
-          this->collection_->connected (supplier);
-          return;
-        }
+              this->collection_->connected (supplier);
+              return;
+            }
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
-      ORBSVCS_DEBUG ((LM_DEBUG, "  not matched\n"));
+          ORBSVCS_DEBUG ((LM_DEBUG, "  not matched\n"));
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
+        }
     }
 }
 
@@ -104,28 +104,28 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  if (this->consumer_ == 0)
-    return;
-
-  const RtecEventChannelAdmin::SupplierQOS& pub =
-    this->consumer_->publications_i ();
-
-  for (CORBA::ULong j = 0; j < pub.publications.length (); ++j)
+  if (this->consumer_ != 0)
     {
-      const RtecEventComm::Event& event =
-        pub.publications[j].event;
+      const RtecEventChannelAdmin::SupplierQOS& pub =
+        this->consumer_->publications_i ();
 
-      //      ORBSVCS_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n",
-      //                  event.header.source, event.header.type,
-      //                  this));
-      if (supplier->can_match (event.header))
+      for (CORBA::ULong j = 0; j < pub.publications.length (); ++j)
         {
-          //          ORBSVCS_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
-          this->collection_->connected (supplier);
-          return;
+          const RtecEventComm::Event& event =
+            pub.publications[j].event;
+
+          //      ORBSVCS_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n",
+          //                  event.header.source, event.header.type,
+          //                  this));
+          if (supplier->can_match (event.header))
+            {
+              //          ORBSVCS_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
+              this->collection_->connected (supplier);
+              return;
+            }
         }
+      this->collection_->disconnected (supplier);
     }
-  this->collection_->disconnected (supplier);
 }
 
 void