Fixed warnings in most recent build.

4 files changed, 32 insertions, 17 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 15c9a297f44..542a24e976d 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,18 @@
+Fri Jan 25 22:39:26 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp:
+
+          Fixed warnings for unused exception variables. Some of them were
+          printing the wrong exception.
+
+        * utils/logWalker/Log.cpp:
+
+          Fixed warning for sprintf of size_t.
+
+        * utils/nslist/nslist.cpp:
+
+          Changed variables to size_t to avoid potential loss of data warning.
+
 Fri Jan 25 22:05:54 UTC 2013  Phillip LaBanca  <labancap@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/README:
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 71aa39dcdb5..75c7e1f89df 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -592,7 +592,7 @@ do_failover_name_test (
           }
           catch (const CosNaming::NamingContext::NotFound& second_ex)
             {
-              ex._tao_print_exception (
+              second_ex._tao_print_exception (
                 ACE_TEXT ("ERROR: It really is not there. Failing...\n"));
               return RC_ERROR;
             }
@@ -670,7 +670,7 @@ do_failover_name_test (
           }
           catch (const CosNaming::NamingContext::NotFound& second_ex)
             {
-              ex._tao_print_exception (
+              second_ex._tao_print_exception (
                 ACE_TEXT ("ERROR: It really is not there. Failing...\n"));
               return RC_ERROR;
             }
@@ -716,7 +716,7 @@ do_failover_name_test (
                           ACE_TEXT ("on retry\n")),
                           RC_ERROR);
     }
-    catch (const CosNaming::NamingContext::NotFound& ex)
+    catch (const CosNaming::NamingContext::NotFound&)
       {
         // Not on replica --- as it should be.
         if (retried)  // Was found on the retry
@@ -793,7 +793,7 @@ do_failover_name_test (
                          ACE_TEXT ("on retry\n")),
                          RC_ERROR);
     }
-    catch (const CosNaming::NamingContext::NotFound& ex)
+    catch (const CosNaming::NamingContext::NotFound&)
       {
         // Not on replica --- as it should be.
         if (retried)  // Was found on the retry
@@ -1214,7 +1214,7 @@ do_persistence_name_test (
           }
           catch (const CosNaming::NamingContext::NotFound& second_ex)
             {
-              ex._tao_print_exception (
+              second_ex._tao_print_exception (
                 ACE_TEXT ("ERROR: It really is not there. Failing...\n"));
               return RC_ERROR;
             }
@@ -1471,7 +1471,7 @@ do_persistence_objectgroup_test (
               return RC_ERROR;
             }
           }
-          catch (const PortableGroup::MemberNotFound& ex )
+          catch (const PortableGroup::MemberNotFound&)
           {
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("ERROR: Unable to find member location %C\n"),
@@ -1482,14 +1482,14 @@ do_persistence_objectgroup_test (
       }
 
     }
-    catch (const PortableGroup::ObjectGroupNotFound& ex )
+    catch (const PortableGroup::ObjectGroupNotFound&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ERROR: Unable to find group %C\n"),
                          basic_group_name),
                          RC_ERROR);
     }
-    catch (const CORBA::Exception& ex)
+    catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ERROR: Unable to list members for group %C\n"),
@@ -1670,7 +1670,7 @@ do_equivalence_name_test (
           }
           catch (const CosNaming::NamingContext::NotFound& second_ex)
             {
-              ex._tao_print_exception (
+              second_ex._tao_print_exception (
                 ACE_TEXT ("ERROR: It really is not there. Failing...\n"));
               return RC_ERROR;
             }
@@ -1753,7 +1753,7 @@ do_equivalence_name_test (
           }
           catch (const CosNaming::NamingContext::NotFound& second_ex)
             {
-              ex._tao_print_exception (
+              second_ex._tao_print_exception (
                 ACE_TEXT ("ERROR: It really is not there. Failing...\n"));
               return RC_ERROR;
             }
@@ -1801,7 +1801,7 @@ do_equivalence_name_test (
                           ACE_TEXT ("on retry\n")),
                           RC_ERROR);
     }
-    catch (const CosNaming::NamingContext::NotFound& ex)
+    catch (const CosNaming::NamingContext::NotFound&)
       {
         // Not on replica --- as it should be.
         if (retried)  // Was found on the retry
@@ -1874,7 +1874,7 @@ do_equivalence_name_test (
                           ACE_TEXT (" on retry\n")),
                           RC_ERROR);
     }
-    catch (const CosNaming::NamingContext::NotFound& ex)
+    catch (const CosNaming::NamingContext::NotFound&)
       {
         // Not on replica --- as it should be.
         if (retried)  // Was found on the retry
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index ba2490009a2..b54e4e22301 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -775,7 +775,8 @@ Log::parse_notify_poa_helper_i (void)
 
   char buffer[100];
   ACE_OS::sprintf (buffer,"Notify object %s, object id %ld, POA %ld on line %ld",
-                   (activate ? "activation" : "deactivation"), objid, poaid, this->offset_);
+                   (activate ? "activation" : "deactivation"), objid, poaid,
+                   (unsigned long)this->offset_);
   ACE_CString text (buffer);
 
   inv->add_notify_incident (text, this->offset_);
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index df69b658cf5..66a66d8e934 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -41,10 +41,9 @@ namespace
   const char
     *myTree = "|",      // Default string to draw tree "tram-lines"
     *myNode = "+";      // Default string to draw tree node end-points
-  int
-    sizeMyTree,         // Initialised by main to strlen (myTree)
-    sizeMyNode,         // Initialised by main to strlen (myNode)
-    maxDepth= 0;        // Limit to display depth (default unlimited)
+  size_t sizeMyTree;    // Initialised by main to strlen (myTree)
+  size_t sizeMyNode;    // Initialised by main to strlen (myNode)
+  int maxDepth= 0;      // Limit to display depth (default unlimited)
   ACE_Time_Value
     rtt = ACE_Time_Value::zero; // relative roundtrip timeout for ctx