diff options
Diffstat (limited to 'ACE/ace/Argv_Type_Converter.cpp')
| -rw-r--r-- | ACE/ace/Argv_Type_Converter.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp index e16076818a4..178d25d9156 100644 --- a/ACE/ace/Argv_Type_Converter.cpp +++ b/ACE/ace/Argv_Type_Converter.cpp @@ -108,11 +108,10 @@ ACE_Argv_Type_Converter::initialize (void) void ACE_Argv_Type_Converter::align_char_with_wchar (void) { - int wchar_argv_index = 0; - wchar_t* match_argv = this->wchar_argv_[0]; // pick the initial entry - - while (wchar_argv_index < this->saved_argc_) + for (int wchar_argv_index = 0; wchar_argv_index < this->saved_argc_; + ++wchar_argv_index) { + wchar_t *match_argv = this->wchar_argv_[wchar_argv_index]; // if n'th entries of both argv lists are different if (ACE_OS::strcmp (this->char_argv_[wchar_argv_index], ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0) @@ -132,9 +131,6 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) } } } - - // move to the next wchar argv list entry - match_argv = this->wchar_argv_[++wchar_argv_index]; } this->cleanup (); @@ -143,11 +139,10 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) void ACE_Argv_Type_Converter::align_wchar_with_char (void) { - int char_argv_index = 0; - char* match_argv = this->char_argv_[0]; // pick the initial entry - - while (char_argv_index < saved_argc_) + for (int char_argv_index = 0; char_argv_index < saved_argc_; + ++char_argv_index) { + char* match_argv = this->char_argv_[char_argv_index]; // if n'th entries of both argv lists are different if (ACE_OS::strcmp ( ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]), @@ -168,9 +163,6 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) } } } - - // move to the next wchar argv list entry - match_argv = this->char_argv_[++char_argv_index]; } this->cleanup(); |