diff options
Diffstat (limited to 'ACE/ace/Codeset_Registry.cpp')
| -rw-r--r-- | ACE/ace/Codeset_Registry.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ACE/ace/Codeset_Registry.cpp b/ACE/ace/Codeset_Registry.cpp index 5d3c6abb59b..b98a1dd7e89 100644 --- a/ACE/ace/Codeset_Registry.cpp +++ b/ACE/ace/Codeset_Registry.cpp @@ -33,9 +33,9 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale, ACE_CDR::UShort *num_sets, ACE_CDR::UShort **char_sets) { - registry_entry const * element = 0; + registry_entry const *element = 0; for (size_t i = 0; element == 0 && i < num_registry_entries_; i++) - if (ACE_OS::strcmp(registry_db_[i].loc_name_,locale.c_str()) == 0) + if (ACE_OS::strcmp (registry_db_[i].loc_name_, locale.c_str ()) == 0) element = ®istry_db_[i]; if (element == 0) return 0; @@ -45,8 +45,7 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale, if (char_sets != 0) { ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0); - ACE_OS::memcpy (*char_sets, - element->char_sets_, + ACE_OS::memcpy (*char_sets, element->char_sets_, element->num_sets_ * sizeof (ACE_CDR::UShort)); } return 1; @@ -58,20 +57,19 @@ ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id, ACE_CDR::UShort *num_sets, ACE_CDR::UShort **char_sets) { - registry_entry const * element = 0; + registry_entry const *element = 0; for (size_t i = 0; element == 0 && i < num_registry_entries_; i++) if (codeset_id == registry_db_[i].codeset_id_) element = ®istry_db_[i]; if (element == 0) return 0; - locale.set(element->loc_name_); + locale.set (element->loc_name_); if (num_sets != 0) *num_sets = element->num_sets_; if (char_sets != 0) { ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0); - ACE_OS::memcpy (*char_sets, - element->char_sets_, + ACE_OS::memcpy (*char_sets, element->char_sets_, element->num_sets_ * sizeof (ACE_CDR::UShort)); } return 1; @@ -81,8 +79,8 @@ int ACE_Codeset_Registry::is_compatible_i (ACE_CDR::ULong codeset_id, ACE_CDR::ULong other) { - registry_entry const * lhs = 0; - registry_entry const * rhs = 0; + registry_entry const *lhs = 0; + registry_entry const *rhs = 0; for (size_t i = 0; (lhs == 0 || rhs == 0) && i < num_registry_entries_; i++) { if (codeset_id == registry_db_[i].codeset_id_) |