locale_facets.tcc (time_get<>::_M_extract_name): Don't use the 'magic number' 10...

2004-06-14  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (time_get<>::_M_extract_name):
	Don't use the 'magic number' 10 in the computation of __minlen;
	never access __name past __minlen; in the loop over __i3, don't
	decrease __nmatches and increase __i3 at once, only either of
	the two; tidy.

From-SVN: r83088

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1454a0d45762c047154ecba4f0af86ec7853d6d0..899ce98f55631b8e4aadb24537a67fc753c07762 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-14  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/locale_facets.tcc (time_get<>::_M_extract_name):
+       Don't use the 'magic number' 10 in the computation of __minlen;
+       never access __name past __minlen; in the loop over __i3, don't
+       decrease __nmatches and increase __i3 at once, only either of
+       the two; tidy.
+
 2004-06-13  Paolo Carlini  <pcarlini@suse.de>
 
        * include/bits/locale_facets.tcc (time_get<>::do_get_time,

diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index c732e09d8c654d3bae87cd91657ca5944013737f..0c181cf3601e94b8ef5b64496cdcbd8afd592133 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -2002,35 +2002,30 @@ namespace std
       while (__nmatches > 1)
        {
          // Find smallest matching string.
-         size_t __minlen = 10;
-         for (size_t __i2 = 0; __i2 < __nmatches; ++__i2)
+         size_t __minlen = __traits_type::length(__names[__matches[0]]);
+         for (size_t __i2 = 1; __i2 < __nmatches; ++__i2)
            __minlen = std::min(__minlen,
                              __traits_type::length(__names[__matches[__i2]]));
+         ++__pos;
          ++__beg;
          if (__pos < __minlen && __beg != __end)
-           {
-             ++__pos;
-             for (size_t __i3 = 0; __i3 < __nmatches; ++__i3)
-               {
-                 __name = __names[__matches[__i3]];
-                 if (__name[__pos] != *__beg)
-                   __matches[__i3] = __matches[--__nmatches];
-               }
-           }
+           for (size_t __i3 = 0; __i3 < __nmatches;)
+             {
+               __name = __names[__matches[__i3]];
+               if (__name[__pos] != *__beg)
+                 __matches[__i3] = __matches[--__nmatches];
+               else
+                 ++__i3;
+             }
          else
            break;
        }
 
       if (__nmatches == 1)
        {
-         // If there was only one match, the first compare is redundant.
-         if (__pos == 0)
-           {
-             ++__pos;
-             ++__beg;
-           }
-
          // Make sure found name is completely extracted.
+         ++__pos;
+         ++__beg;
          __name = __names[__matches[0]];
          const size_t __len = __traits_type::length(__name);
          while (__pos < __len && __beg != __end && __name[__pos] == *__beg)