diff options
Diffstat (limited to 'ace/Codeset_Registry.cpp')
| -rw-r--r-- | ace/Codeset_Registry.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/ace/Codeset_Registry.cpp b/ace/Codeset_Registry.cpp index 5d3c6abb59b..6cdb913bce4 100644 --- a/ace/Codeset_Registry.cpp +++ b/ace/Codeset_Registry.cpp @@ -21,11 +21,8 @@ #include "ace/Codeset_Registry.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Codeset_Registry, - "$Id$") +ACE_RCSID(ace, Codeset_Registry, "$Id$") -ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale, @@ -33,7 +30,7 @@ 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* 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) element = ®istry_db_[i]; @@ -45,8 +42,8 @@ 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 (element->char_sets_, + *char_sets, element->num_sets_ * sizeof (ACE_CDR::UShort)); } return 1; @@ -58,7 +55,7 @@ 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* 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]; @@ -70,8 +67,8 @@ ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id, 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 (element->char_sets_, + *char_sets, element->num_sets_ * sizeof (ACE_CDR::UShort)); } return 1; @@ -81,8 +78,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* lhs = 0; + registry_entry* rhs = 0; for (size_t i = 0; (lhs == 0 || rhs == 0) && i < num_registry_entries_; i++) { if (codeset_id == registry_db_[i].codeset_id_) @@ -109,5 +106,3 @@ ACE_Codeset_Registry::get_max_bytes_i (ACE_CDR::ULong codeset_id) return registry_db_[i].max_bytes_; return 0; } - -ACE_END_VERSIONED_NAMESPACE_DECL |