More warnings fix

sonndinh · Aug 7, 2024 · f938fa6 · f938fa6
1 parent a0f6cb7
commit f938fa6
Show file tree

Hide file tree

Showing 18 changed files with 111 additions and 115 deletions.
diff --git a/dds/DCPS/MultiTopicDataReader_T.cpp b/dds/DCPS/MultiTopicDataReader_T.cpp
@@ -122,7 +122,7 @@ MultiTopicDataReader_T<Sample, TypedDataReader>::join(
     for (InstanceHandle_t ih = HANDLE_NIL; ret != RETCODE_NO_DATA;) {
       GenericData other_data(other_meta, false);
       SampleInfo info;
-      const ReturnCode_t ret = other_dri->read_next_instance_generic(other_data.ptr_,
+      ret = other_dri->read_next_instance_generic(other_data.ptr_,
         info, ih, READ_SAMPLE_STATE, ANY_VIEW_STATE, ALIVE_INSTANCE_STATE);
       if (ret != RETCODE_OK && ret != RETCODE_NO_DATA) {
         if (log_level >= LogLevel::Notice) {

diff --git a/dds/DCPS/NetworkResource.cpp b/dds/DCPS/NetworkResource.cpp
@@ -904,13 +904,11 @@ int locator_to_address(ACE_INET_Addr& dest,
     ) == -1) {
       return -1;
     }
-    dest.set_port_number(locator.port);
+    dest.set_port_number(static_cast<u_short>(locator.port));
     return 0;
   default:
     return -1;  // Unknown kind
   }
-
-  return -1;
 }
 
 OpenDDS_Dcps_Export

diff --git a/dds/DCPS/OwnershipManager.cpp b/dds/DCPS/OwnershipManager.cpp
@@ -332,12 +332,10 @@ OwnershipManager::select_owner(const DDS::InstanceHandle_t& instance_handle,
       // if strength was changed.
       const WriterInfos::iterator the_end = infos.candidates_.end();
 
-      for (WriterInfos::iterator iter = infos.candidates_.begin();
-           iter != the_end; ++iter) {
-
-        if (iter->pub_id_ == pub_id) {
-          if (iter->ownership_strength_ != ownership_strength) {
-            iter->ownership_strength_ = ownership_strength;
+      for (WriterInfos::iterator it = infos.candidates_.begin(); it != the_end; ++it) {
+        if (it->pub_id_ == pub_id) {
+          if (it->ownership_strength_ != ownership_strength) {
+            it->ownership_strength_ = ownership_strength;
           } else {
             sort = false;
           }

diff --git a/dds/DCPS/PublisherImpl.cpp b/dds/DCPS/PublisherImpl.cpp
@@ -470,10 +470,10 @@ PublisherImpl::set_qos(const DDS::PublisherQos & qos)
         for (PublicationMap::iterator iter = publication_map_.begin();
             iter != publication_map_.end();
             ++iter) {
-          DDS::DataWriterQos qos = iter->second->qos_;
+          DDS::DataWriterQos dw_qos = iter->second->qos_;
           GUID_t id = iter->second->get_guid();
           std::pair<DwIdToQosMap::iterator, bool> pair =
-              idToQosMap.insert(DwIdToQosMap::value_type(id, qos));
+              idToQosMap.insert(DwIdToQosMap::value_type(id, dw_qos));
 
           if (!pair.second) {
             if (DCPS_debug_level > 0) {

diff --git a/dds/DCPS/RTPS/Spdp.cpp b/dds/DCPS/RTPS/Spdp.cpp
@@ -3191,9 +3191,9 @@ Spdp::SpdpTransport::handle_input(ACE_HANDLE h)
           plist[len].user_tag(userTag);
         }
 
-        DCPS::RcHandle<Spdp> outer = outer_.lock();
-        if (outer) {
-          outer->data_received(data, plist, remote_na);
+        DCPS::RcHandle<Spdp> outer_rc = outer_.lock();
+        if (outer_rc) {
+          outer_rc->data_received(data, plist, remote_na);
         }
         break;
       }

diff --git a/dds/DCPS/Service_Participant.cpp b/dds/DCPS/Service_Participant.cpp
@@ -126,7 +126,7 @@ String toupper(const String& x)
 {
   String retval;
   for (String::const_iterator pos = x.begin(), limit = x.end(); pos != limit; ++pos) {
-    retval.push_back(ACE_OS::ace_toupper(*pos));
+    retval.push_back(static_cast<char>(ACE_OS::ace_toupper(*pos)));
   }
   return retval;
 }
@@ -296,7 +296,7 @@ DDS::ReturnCode_t Service_Participant::shutdown()
       domainRepoMap_.clear();
 
       {
-        ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, network_config_monitor_lock_,
+        ACE_GUARD_RETURN(ACE_Thread_Mutex, ncm_guard, network_config_monitor_lock_,
           DDS::RETCODE_OUT_OF_RESOURCES);
         if (network_config_monitor_) {
           network_config_monitor_->close();

diff --git a/dds/DCPS/StaticDiscovery.cpp b/dds/DCPS/StaticDiscovery.cpp
@@ -347,10 +347,10 @@ StaticEndpointManager::add_publication_i(const GUID_t& writerid,
   }
   const EndpointRegistry::Writer& writer = pos->second;
 
-  for (RepoIdSet::const_iterator pos = writer.best_effort_readers.begin(), limit = writer.best_effort_readers.end();
-       pos != limit;
-       ++pos) {
-    const GUID_t& readerid = *pos;
+  for (RepoIdSet::const_iterator iter = writer.best_effort_readers.begin(), limit = writer.best_effort_readers.end();
+       iter != limit;
+       ++iter) {
+    const GUID_t& readerid = *iter;
     const EndpointRegistry::Reader& reader = registry_.reader_map.find(readerid)->second;
 
     const ReaderAssociation ra =
@@ -361,10 +361,10 @@ StaticEndpointManager::add_publication_i(const GUID_t& writerid,
     }
   }
 
-  for (RepoIdSet::const_iterator pos = writer.reliable_readers.begin(), limit = writer.reliable_readers.end();
-       pos != limit;
-       ++pos) {
-    const GUID_t& readerid = *pos;
+  for (RepoIdSet::const_iterator iter = writer.reliable_readers.begin(), limit = writer.reliable_readers.end();
+       iter != limit;
+       ++iter) {
+    const GUID_t& readerid = *iter;
     const EndpointRegistry::Reader& reader = registry_.reader_map.find(readerid)->second;
     DataWriterCallbacks_rch pl = pub.publication_.lock();
     if (pl) {
@@ -388,10 +388,10 @@ StaticEndpointManager::remove_publication_i(const GUID_t& writerid, LocalPublica
   ReaderIdSeq ids;
   ids.length((CORBA::ULong)writer.reliable_readers.size());
   CORBA::ULong idx = 0;
-  for (RepoIdSet::const_iterator pos = writer.reliable_readers.begin(), limit = writer.reliable_readers.end();
-        pos != limit;
-        ++pos, ++idx) {
-    const GUID_t& readerid = *pos;
+  for (RepoIdSet::const_iterator iter = writer.reliable_readers.begin(), limit = writer.reliable_readers.end();
+       iter != limit;
+       ++iter, ++idx) {
+    const GUID_t& readerid = *iter;
     ids[idx] = readerid;
     DataWriterCallbacks_rch pl = pub.publication_.lock();
     if (pl) {
@@ -417,10 +417,10 @@ StaticEndpointManager::add_subscription_i(const GUID_t& readerid,
   }
   const EndpointRegistry::Reader& reader = pos->second;
 
-  for (RepoIdSet::const_iterator pos = reader.best_effort_writers.begin(), limit = reader.best_effort_writers.end();
-       pos != limit;
-       ++pos) {
-    const GUID_t& writerid = *pos;
+  for (RepoIdSet::const_iterator iter = reader.best_effort_writers.begin(), limit = reader.best_effort_writers.end();
+       iter != limit;
+       ++iter) {
+    const GUID_t& writerid = *iter;
     const EndpointRegistry::Writer& writer = registry_.writer_map.find(writerid)->second;
 
     DDS::OctetSeq type_info;
@@ -433,10 +433,10 @@ StaticEndpointManager::add_subscription_i(const GUID_t& readerid,
     }
   }
 
-  for (RepoIdSet::const_iterator pos = reader.reliable_writers.begin(), limit = reader.reliable_writers.end();
-       pos != limit;
-       ++pos) {
-    const GUID_t& writerid = *pos;
+  for (RepoIdSet::const_iterator iter = reader.reliable_writers.begin(), limit = reader.reliable_writers.end();
+       iter != limit;
+       ++iter) {
+    const GUID_t& writerid = *iter;
     const EndpointRegistry::Writer& writer = registry_.writer_map.find(writerid)->second;
     DataReaderCallbacks_rch sl = sub.subscription_.lock();
     if (sl) {
@@ -460,10 +460,10 @@ DDS::ReturnCode_t StaticEndpointManager::remove_subscription_i(
   WriterIdSeq ids;
   ids.length((CORBA::ULong)reader.reliable_writers.size());
   CORBA::ULong idx = 0;
-  for (RepoIdSet::const_iterator pos = reader.reliable_writers.begin(), limit = reader.reliable_writers.end();
-        pos != limit;
-        ++pos, ++idx) {
-    const GUID_t& writerid = *pos;
+  for (RepoIdSet::const_iterator iter = reader.reliable_writers.begin(), limit = reader.reliable_writers.end();
+       iter != limit;
+       ++iter, ++idx) {
+    const GUID_t& writerid = *iter;
     ids[idx] = writerid;
     DataReaderCallbacks_rch sl = sub.subscription_.lock();
     if (sl) {
@@ -2032,9 +2032,9 @@ StaticDiscovery::parse_endpoints()
   const ConfigStoreImpl::StringList sections = config_store->get_section_names("ENDPOINT");
 
   // Loop through the [endpoint/*] sections
-  for (ConfigStoreImpl::StringList::const_iterator pos = sections.begin(), limit = sections.end();
-       pos != limit; ++pos) {
-    const String& endpoint_name = *pos;
+  for (ConfigStoreImpl::StringList::const_iterator iter = sections.begin(), limit = sections.end();
+       iter != limit; ++iter) {
+    const String& endpoint_name = *iter;
 
     if (DCPS_debug_level > 0) {
       ACE_DEBUG((LM_NOTICE,

diff --git a/dds/DCPS/WriteDataContainer.cpp b/dds/DCPS/WriteDataContainer.cpp
@@ -366,7 +366,7 @@ WriteDataContainer::reenqueue_all(const GUID_t& reader_id,
                    total_size);
 
   {
-    ACE_Guard<ACE_SYNCH_MUTEX> guard(wfa_lock_);
+    ACE_Guard<ACE_SYNCH_MUTEX> wfa_guard(wfa_lock_);
     cached_cumulative_ack_valid_ = false;
     DisjointSequence& ds = acked_sequences_[reader_id];
     ds = acked_sequences_[GUID_UNKNOWN];

diff --git a/dds/DCPS/XTypes/DynamicDataAdapter.cpp b/dds/DCPS/XTypes/DynamicDataAdapter.cpp
@@ -128,7 +128,7 @@ DDS::MemberId DynamicDataAdapter::get_member_id_at_index(DDS::UInt32 index)
       } else if (index == 1) {
         bool branch_active;
         DDS::MemberDescriptor_var active_branch;
-        DDS::ReturnCode_t rc = get_selected_union_branch(branch_active, active_branch);
+        rc = get_selected_union_branch(branch_active, active_branch);
         if (rc != DDS::RETCODE_OK) {
           if (DCPS::log_level >= DCPS::LogLevel::Warning) {
             const CORBA::String_var type_name = type_->get_name();
@@ -158,7 +158,7 @@ DDS::MemberId DynamicDataAdapter::get_member_id_at_index(DDS::UInt32 index)
     return get_member_id_at_index_impl(index);
   case TK_ARRAY:
     {
-      DDS::ReturnCode_t rc = check_index("get_member_id_at_index", index, bound_total(type_desc_));
+      rc = check_index("get_member_id_at_index", index, bound_total(type_desc_));
       if (rc != DDS::RETCODE_OK) {
         if (DCPS::log_level >= DCPS::LogLevel::Warning) {
           const CORBA::String_var type_name = type_->get_name();

diff --git a/dds/DCPS/XTypes/DynamicDataXcdrReadImpl.cpp b/dds/DCPS/XTypes/DynamicDataXcdrReadImpl.cpp
@@ -1789,7 +1789,7 @@ DDS::ReturnCode_t DynamicDataXcdrReadImpl::get_values_from_struct(SequenceType&
       }
       const LBound bit_bound = etd->bound()[0];
       if (bit_bound >= lower && bit_bound <= upper) {
-        const DDS::ReturnCode_t rc = skip_to_struct_member(md, id);
+        rc = skip_to_struct_member(md, id);
         if (rc != DDS::RETCODE_OK) {
           return rc;
         }
@@ -1912,11 +1912,11 @@ bool DynamicDataXcdrReadImpl::get_values_from_sequence(SequenceType& value, Memb
       return skip_to_sequence_element(id) && read_values(value, ElementTypeKind);
     } else if (nested_elem_tk == enum_or_bitmask) {
       // Read from a sequence of sequences of enums or bitmasks.
-      DDS::TypeDescriptor_var td;
-      if (nested_elem_type->get_descriptor(td) != DDS::RETCODE_OK) {
+      DDS::TypeDescriptor_var nested_td;
+      if (nested_elem_type->get_descriptor(nested_td) != DDS::RETCODE_OK) {
         return false;
       }
-      const LBound bit_bound = td->bound()[0];
+      const LBound bit_bound = nested_td->bound()[0];
       return bit_bound >= lower && bit_bound <= upper &&
         skip_to_sequence_element(id) && read_values(value, enum_or_bitmask);
     }
@@ -1953,11 +1953,11 @@ bool DynamicDataXcdrReadImpl::get_values_from_array(SequenceType& value, MemberI
   if (nested_elem_tk == ElementTypeKind) {
     return skip_to_array_element(id) && read_values(value, nested_elem_tk);
   } else if (nested_elem_tk == enum_or_bitmask) {
-    DDS::TypeDescriptor_var td;
-    if (nested_elem_type->get_descriptor(td) != DDS::RETCODE_OK) {
+    DDS::TypeDescriptor_var nested_td;
+    if (nested_elem_type->get_descriptor(neste_td) != DDS::RETCODE_OK) {
       return false;
     }
-    const LBound bit_bound = td->bound()[0];
+    const LBound bit_bound = nested_td->bound()[0];
     return bit_bound >= lower && bit_bound <= upper &&
       skip_to_array_element(id) && read_values(value, nested_elem_tk);
   }
@@ -1993,11 +1993,11 @@ bool DynamicDataXcdrReadImpl::get_values_from_map(SequenceType& value, MemberId
   if (nested_elem_tk == ElementTypeKind) {
     return skip_to_map_element(id) && read_values(value, nested_elem_tk);
   } else if (nested_elem_tk == enum_or_bitmask) {
-    DDS::TypeDescriptor_var td;
-    if (nested_elem_type->get_descriptor(td) != DDS::RETCODE_OK) {
+    DDS::TypeDescriptor_var nested_td;
+    if (nested_elem_type->get_descriptor(nested_td) != DDS::RETCODE_OK) {
       return false;
     }
-    const LBound bit_bound = td->bound()[0];
+    const LBound bit_bound = nested_td->bound()[0];
     return bit_bound >= lower && bit_bound <= upper &&
       skip_to_map_element(id) && read_values(value, nested_elem_tk);
   }
@@ -2905,11 +2905,11 @@ bool DynamicDataXcdrReadImpl::check_xcdr1_mutable_i(DDS::DynamicType_ptr dt, Dyn
       }
       return false;
     }
-    DDS::MemberDescriptor_var descriptor;
-    if (dtm->get_descriptor(descriptor) != DDS::RETCODE_OK) {
+    DDS::MemberDescriptor_var mem_desc;
+    if (dtm->get_descriptor(mem_desc) != DDS::RETCODE_OK) {
       return false;
     }
-    if (!check_xcdr1_mutable_i(descriptor->type(), dtns)) {
+    if (!check_xcdr1_mutable_i(mem_desc->type(), dtns)) {
       return false;
     }
   }

diff --git a/dds/DCPS/XTypes/TypeAssignability.cpp b/dds/DCPS/XTypes/TypeAssignability.cpp
@@ -777,9 +777,9 @@ bool TypeAssignability::assignable_union(const MinimalTypeObject& ta,
       for (unsigned k = 0; k < label_seq_b.length(); ++k) {
         for (unsigned t = 0; t < label_seq_a.length(); ++t) {
           if (label_seq_b.members[k] == label_seq_a.members[t]) {
-            const TypeIdentifier& tia = ta.union_type.member_seq[j].common.type_id;
-            const TypeIdentifier& tib = tb.union_type.member_seq[i].common.type_id;
-            if (!assignable(tia, tib)) {
+            const TypeIdentifier& ti_a = ta.union_type.member_seq[j].common.type_id;
+            const TypeIdentifier& ti_b = tb.union_type.member_seq[i].common.type_id;
+            if (!assignable(ti_a, ti_b)) {
               return false;
             }
             matched = true;
@@ -795,18 +795,18 @@ bool TypeAssignability::assignable_union(const MinimalTypeObject& ta,
   // the type of the member in T1 is assignable from the type of the default
   // member in T2
   for (unsigned i = 0; i < tb.union_type.member_seq.length(); ++i) {
-    const UnionMemberFlag& flags_b = tb.union_type.member_seq[i].common.member_flags;
-    if ((flags_b & IS_DEFAULT) == IS_DEFAULT) {
+    const UnionMemberFlag& mem_flags_b = tb.union_type.member_seq[i].common.member_flags;
+    if ((mem_flags_b & IS_DEFAULT) == IS_DEFAULT) {
       const UnionCaseLabelSeq& label_seq_b = tb.union_type.member_seq[i].common.label_seq;
       for (unsigned j = 0; j < ta.union_type.member_seq.length(); ++j) {
         const UnionCaseLabelSeq& label_seq_a = ta.union_type.member_seq[j].common.label_seq;
         bool matched = false;
         for (unsigned k = 0; k < label_seq_a.length(); ++k) {
           for (unsigned t = 0; t < label_seq_b.length(); ++t) {
             if (label_seq_a[k] == label_seq_b[t]) {
-              const TypeIdentifier& tia = ta.union_type.member_seq[j].common.type_id;
-              const TypeIdentifier& tib = tb.union_type.member_seq[i].common.type_id;
-              if (!assignable(tia, tib)) {
+              const TypeIdentifier& ti_a = ta.union_type.member_seq[j].common.type_id;
+              const TypeIdentifier& ti_b = tb.union_type.member_seq[i].common.type_id;
+              if (!assignable(ti_a, ti_b)) {
                 return false;
               }
               matched = true;
@@ -823,14 +823,14 @@ bool TypeAssignability::assignable_union(const MinimalTypeObject& ta,
   // If T1 and T2 both have default labels, the type of T1's default member
   // is assignable from the type of T2's default member
   for (unsigned i = 0; i < ta.union_type.member_seq.length(); ++i) {
-    const UnionMemberFlag& flags_a = ta.union_type.member_seq[i].common.member_flags;
-    if ((flags_a & IS_DEFAULT) == IS_DEFAULT) {
+    const UnionMemberFlag& mem_flags_a = ta.union_type.member_seq[i].common.member_flags;
+    if ((mem_flags_a & IS_DEFAULT) == IS_DEFAULT) {
       for (unsigned j = 0; j < tb.union_type.member_seq.length(); ++j) {
-        const UnionMemberFlag& flags_b = tb.union_type.member_seq[j].common.member_flags;
-        if ((flags_b & IS_DEFAULT) == IS_DEFAULT) {
-          const TypeIdentifier& tia = ta.union_type.member_seq[i].common.type_id;
-          const TypeIdentifier& tib = tb.union_type.member_seq[j].common.type_id;
-          if (!assignable(tia, tib)) {
+        const UnionMemberFlag& mem_flags_b = tb.union_type.member_seq[j].common.member_flags;
+        if ((mem_flags_b & IS_DEFAULT) == IS_DEFAULT) {
+          const TypeIdentifier& ti_a = ta.union_type.member_seq[i].common.type_id;
+          const TypeIdentifier& ti_b = tb.union_type.member_seq[j].common.type_id;
+          if (!assignable(ti_a, ti_b)) {
             return false;
           }
           break;

diff --git a/dds/DCPS/XTypes/TypeLookupService.cpp b/dds/DCPS/XTypes/TypeLookupService.cpp
@@ -747,8 +747,8 @@ void TypeLookupService::complete_to_dynamic_i(DynamicTypeImpl* dt,
       md->name(cto.bitmask_type.flag_seq[i].detail.name.c_str());
       // Use Id to convey the position of bit flag.
       md->id(cto.bitmask_type.flag_seq[i].common.position);
-      const DDS::DynamicType_var temp = type_identifier_to_dynamic(TypeIdentifier(TK_BOOLEAN), guid);
-      md->type(temp);
+      const DDS::DynamicType_var temp2 = type_identifier_to_dynamic(TypeIdentifier(TK_BOOLEAN), guid);
+      md->type(temp2);
       md->index(i);
       dtm->set_descriptor(md);
       dt->insert_dynamic_member(dtm);