Thu Dec 15 20:46:52 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 89 insertions, 51 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 027eec91042..87ffb8996d8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Dec 15 20:46:52 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+
+          Addressed the rest of the Coverity-reported issues for the
+          IDL compiler.
+
 Thu Dec 15 18:03:34 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_valuetype.cpp:
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 57aa73db6d6..fadaf82ef46 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -695,8 +695,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
                   << be_idt << be_idt_nl
                   << "objref," << be_nl
                   << "_tao_collocated," << be_nl
-                  << "servant"
-                  << (the_check ? ", oc" : "") << be_uidt_nl
+                  << "servant" << be_uidt_nl
                   << ")" << be_uidt;
             }
 
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index f8c1fa664c4..8b203742dbd 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -334,13 +334,6 @@ be_sequence::managed_type (void)
               be_predefined_type * const bpd =
                 be_predefined_type::narrow_from_decl (prim_type);
 
-              if (!bt)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "TAO_IDL (%N:%l) "
-                                   "be_predefined_type::narrow_from_decl "
-                                   "failed\n"),
-                                  be_sequence::MNG_UNKNOWN);
-
               AST_PredefinedType::PredefinedType pt = bpd->pt ();
 
               switch (pt)
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index 6088791ee71..ebcda8b0373 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -37,9 +37,9 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_exception_cdr_op_cs::"
-                         "visit_exception - "
-                         "codegen for scope failed\n"),
+                         ACE_TEXT ("(be_visitor_exception_cdr_op_cs::")
+                         ACE_TEXT ("visit_exception - ")
+                         ACE_TEXT ("codegen for scope failed\n")),
                         -1);
     }
 
@@ -69,9 +69,9 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
       if (field_decl.visit_scope (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_cdr_op_cs::"
-                             "visit_exception - "
-                             "codegen for field decl scope failed\n"),
+                             ACE_TEXT ("be_visitor_exception_cdr_op_cs::")
+                             ACE_TEXT ("visit_exception - ")
+                             ACE_TEXT ("codegen for field decl scope failed\n")),
                             -1);
         }
 
@@ -85,9 +85,9 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
       if (this->visit_scope (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_cdr_op_cs::"
-                             "visit_exception - "
-                             "codegen for scope failed\n"),
+                             ACE_TEXT ("be_visitor_exception_cdr_op_cs::")
+                             ACE_TEXT ("visit_exception - ")
+                             ACE_TEXT ("codegen for scope failed\n")),
                             -1);
         }
 
@@ -139,7 +139,15 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
     {
       be_visitor_context new_ctx (*this->ctx_);
       be_visitor_cdr_op_field_decl field_decl (&new_ctx);
-      field_decl.visit_scope (node);
+
+      if (field_decl.visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_exception_cdr_op_cs::")
+                             ACE_TEXT ("visit_exception - ")
+                             ACE_TEXT ("codegen for field decl failed\n")),
+                            -1);
+        }
 
       // Some members.
       *os << "// Demarshal the members." << be_nl
@@ -148,9 +156,9 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
       if (this->visit_scope (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_cdr_op_cs::"
-                             "visit_exception - "
-                             "codegen for scope failed\n"),
+                             ACE_TEXT ("be_visitor_exception_cdr_op_cs::")
+                             ACE_TEXT ("visit_exception - ")
+                             ACE_TEXT ("codegen for scope failed\n")),
                             -1);
         }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
index 10e4fcad29b..1ebc69b16e4 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
@@ -40,9 +40,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_cdr_op_cs::"
-                         "visit_structure - "
-                         "codegen for scope failed\n"),
+                         ACE_TEXT ("be_visitor_structure_cdr_op_cs::")
+                         ACE_TEXT ("visit_structure - ")
+                         ACE_TEXT ("codegen for scope failed\n")),
                         -1);
     }
 
@@ -64,16 +64,24 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
 
   be_visitor_context new_ctx (*this->ctx_);
   be_visitor_cdr_op_field_decl field_decl (&new_ctx);
-  field_decl.visit_scope (node);
+
+  if (field_decl.visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_structure_cdr_op_cs::")
+                         ACE_TEXT ("visit_structure - ")
+                         ACE_TEXT ("codegen for field decl failed\n")),
+                        -1);
+    }
 
   *os << "return" << be_idt_nl;
 
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_cdr_op_cs::"
-                         "visit_structure - "
-                         "codegen for scope failed\n"),
+                         ACE_TEXT ("be_visitor_structure_cdr_op_cs::")
+                         ACE_TEXT ("visit_structure - ")
+                         ACE_TEXT ("codegen for scope failed\n")),
                         -1);
     }
 
@@ -113,9 +121,10 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
       if (field_decl.visit_scope (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_cdr_op_cs::"
-                             "visit_structure - "
-                             "codegen for field decl scope failed\n"),
+                             ACE_TEXT ("be_visitor_structure_cdr_op_cs::")
+                             ACE_TEXT ("visit_structure - ")
+                             ACE_TEXT ("codegen for field ")
+                             ACE_TEXT ("decl scope failed\n")),
                             -1);
         }
 
@@ -124,9 +133,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
       if (this->visit_scope (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_cdr_op_cs"
-                             "::visit_structure - "
-                             "codegen for scope failed\n"),
+                             ACE_TEXT ("be_visitor_structure_cdr_op_cs")
+                             ACE_TEXT ("::visit_structure - ")
+                             ACE_TEXT ("codegen for scope failed\n")),
                             -1);
         }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 4da86d449bd..22898c96a88 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -94,9 +94,10 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   if (field_out_cdr.visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_marshal_cs::"
-                         "visit_valuetype - "
-                         "codegen for field out cdr scope failed\n"),
+                         ACE_TEXT ("be_visitor_valuetype_marshal_cs::")
+                         ACE_TEXT ("visit_valuetype - ")
+                         ACE_TEXT ("codegen for field out ")
+                         ACE_TEXT ("cdr scope failed\n")),
                         -1);
     }
 
@@ -182,7 +183,16 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
     }
 
   be_visitor_valuetype_field_cdr_decl field_in_cdr (&new_ctx);
-  field_in_cdr.visit_scope (node);
+
+  if (field_in_cdr.visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_valuetype_marshal_cs::")
+                         ACE_TEXT ("visit_valuetype - ")
+                         ACE_TEXT ("codegen for field in ")
+                         ACE_TEXT ("cdr scope failed\n")),
+                        -1);
+    }
 
   if (node->data_members_count () > 0)
     {
@@ -262,8 +272,8 @@ be_visitor_valuetype_marshal_cs::gen_fields (be_valuetype *node,
       if (!d)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_scope::visit_scope - "
-                             "bad node in this scope\n"),
+                             ACE_TEXT ("be_visitor_scope::visit_scope - ")
+                             ACE_TEXT ("bad node in this scope\n")),
                             -1);
         }
 
@@ -288,9 +298,9 @@ be_visitor_valuetype_marshal_cs::gen_fields (be_valuetype *node,
           if (visitor.visit_field (field) == -1)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_valuetype_marshal_cs::"
-                                 "visit_valuetype - "
-                                 "codegen for scope failed\n"),
+                                 ACE_TEXT ("be_visitor_valuetype_marshal_cs::")
+                                 ACE_TEXT ("visit_valuetype - ")
+                                 ACE_TEXT ("codegen for scope failed\n")),
                                 -1);
             }
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index dbe0de1df37..478fd309ef0 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -726,9 +726,9 @@ be_visitor_valuetype::gen_field_pd (be_field *node)
   if (!bt || !vt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ch::"
-                         "visit_field - "
-                         "Bad field type\n"),
+                         ACE_TEXT ("be_visitor_valuetype::")
+                         ACE_TEXT ("gen_field_pd - ")
+                         ACE_TEXT ("Bad field type\n")),
                         -1);
     }
 
@@ -743,9 +743,9 @@ be_visitor_valuetype::gen_field_pd (be_field *node)
   if (bt->accept (&visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ch::"
-                         "visit_field - "
-                         "codegen for field type failed\n"),
+                         ACE_TEXT ("be_visitor_valuetype::")
+                         ACE_TEXT ("gen_field_pd - ")
+                         ACE_TEXT ("codegen for field type failed\n")),
                         -1);
     }
 
@@ -805,7 +805,14 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node,
                        ft,
                        &sn);
       ft->seen_in_operation (seen);
-      visitor.visit_argument (&arg);
+
+      if (visitor.visit_argument (&arg) == -1)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("be_visitor_valuetype::")
+                      ACE_TEXT ("gen_obv_init_constructor_args - ")
+                      ACE_TEXT ("codegen for argument failed\n")));
+        }
 
       // AST_Argument inherits from AST_Field, which will destroy
       // its field type if it is anonymous - we don't want that.