diff options
author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-16 20:06:12 +0000 |
---|---|---|
committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-16 20:06:12 +0000 |
commit | cb0ec3e05ef6e403b731c298076f76743888eb97 (patch) | |
tree | a6f5a4c5900fe01a80a6697df5f0d8f84cca8775 /ace | |
parent | 260d52436b0b7962d125cf4c62d1c564e0be3a2b (diff) | |
download | ATCD-cb0ec3e05ef6e403b731c298076f76743888eb97.tar.gz |
ChangeLogTag:Wed Apr 16 19:27:29 UTC 2003 Don Hinton <dhinton@drestystems.com>
Diffstat (limited to 'ace')
-rw-r--r-- | ace/Configuration.cpp | 4 | ||||
-rw-r--r-- | ace/Configuration.h | 2 | ||||
-rw-r--r-- | ace/Configuration_Import_Export.cpp | 4 | ||||
-rw-r--r-- | ace/Get_Opt.cpp | 10 | ||||
-rw-r--r-- | ace/Get_Opt.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index c4ee9bc94e3..8a74f4aaa21 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -247,7 +247,7 @@ ACE_Configuration::validate_value_name (const ACE_TCHAR* name) { if (name == 0 || *name == this->NULL_String_) return 0; - + return this->validate_name (name); } @@ -1853,7 +1853,7 @@ ACE_Configuration_Heap::set_string_value (const ACE_Configuration_Section_Key& k else { // it doesn't exist, bind it - ACE_TCHAR* pers_name = + ACE_TCHAR* pers_name = (ACE_TCHAR *) allocator_->malloc ((ACE_OS::strlen (t_name) + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (pers_name, t_name); ACE_TCHAR* pers_value = diff --git a/ace/Configuration.h b/ace/Configuration.h index aecbe08b3bd..20ce501e6be 100644 --- a/ace/Configuration.h +++ b/ace/Configuration.h @@ -402,7 +402,7 @@ protected: */ int validate_name (const ACE_TCHAR* name, int allow_path = 0); - /** + /** * Test to see if <name> is valid. The default value for a key can be * unnamed, which means either <name> is == 0 or <name> == '\0` is * valid. Otherwise, it calls validate_name() to test <name> for the diff --git a/ace/Configuration_Import_Export.cpp b/ace/Configuration_Import_Export.cpp index 8f7e9e47b4f..7f338f7c437 100644 --- a/ace/Configuration_Import_Export.cpp +++ b/ace/Configuration_Import_Export.cpp @@ -362,8 +362,8 @@ ACE_Ini_ImpExp::import_config (const ACE_TCHAR* filename) { ACE_TCHAR *line = this->squish (buffer); // Check for a comment and blank line - if (line[0] == ACE_LIB_TEXT (';') || - line[0] == ACE_LIB_TEXT ('#') || + if (line[0] == ACE_LIB_TEXT (';') || + line[0] == ACE_LIB_TEXT ('#') || line[0] == '\0') continue; diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp index fad5cd4c245..3c3508bcd17 100644 --- a/ace/Get_Opt.cpp +++ b/ace/Get_Opt.cpp @@ -345,11 +345,11 @@ ACE_Get_Opt::short_option_i (void) /* Look at and handle the next option-character. */ ACE_TCHAR opt = *this->nextchar_++; - // Set last_option_ to opt + // Set last_option_ to opt this->last_option (opt); ACE_TCHAR *oli = 0; - oli = ACE_const_cast (ACE_TCHAR*, + oli = ACE_const_cast (ACE_TCHAR*, ACE_OS::strchr (this->optstring_.c_str (), opt)); /* Increment `optind' when we start to process its last character. */ @@ -481,7 +481,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, // add it. ACE_TCHAR *s = 0; if ((s = ACE_const_cast (ACE_TCHAR*, - ACE_OS::strchr (this->optstring_.c_str (), + ACE_OS::strchr (this->optstring_.c_str (), short_option))) != 0) { // Short option exists, so verify the argument options @@ -583,7 +583,7 @@ ACE_Get_Opt::dump (void) const ACE_TRACE ("ACE_Get_Opt::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") ACE_LIB_TEXT ("opstring_ = %s\n") ACE_LIB_TEXT ("long_only_ = %d\n") ACE_LIB_TEXT ("has_colon_ = %d\n") @@ -599,7 +599,7 @@ ACE_Get_Opt::dump (void) const this->optopt_, this->ordering_)); - // now loop through the + // now loop through the size_t size = this->long_opts_.size (); for (u_int i = 0; i < size ; ++i) { diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h index 2ae325bab20..a8fcf9a55d6 100644 --- a/ace/Get_Opt.h +++ b/ace/Get_Opt.h @@ -288,7 +288,7 @@ public: ACE_TCHAR **argv (void) const; /// Accessor for the @c last_option that was processed. This allows - /// applications to know if the found option was a short or long + /// applications to know if the found option was a short or long /// option, and is especially useful in cases where it was invalid /// and the caller wants to print out the invalid value. const ACE_TCHAR *last_option (void) const; |