summary refs log tree commit diff
path: root/locale/indigitswc.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-28 17:45:15 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-28 17:45:15 +0000
commiteac4282fa6325e5633bdfee7a6afd9f943b34b1a (patch)
tree05ea52c568ad29879831e555bcf4dfa05d478d9b /locale/indigitswc.h
parentdab46544a261b41876829905c634a5f5558ceacf (diff)
downloadglibc-eac4282fa6325e5633bdfee7a6afd9f943b34b1a.tar.gz
glibc-eac4282fa6325e5633bdfee7a6afd9f943b34b1a.tar.xz
glibc-eac4282fa6325e5633bdfee7a6afd9f943b34b1a.zip
Update.
2000-07-27  Jakub Jelinek  <jakub@redhat.com>

	* locale/indigits.h (indigit_value): Correct.
	* locale/indigitswc.h (indigitwc_value): Correct.
	* stdio-common/vfscanf.c (__vfscanf): Fix I18N number
	conversion, add GROUP checking for it, fix GROUP number
	conversion with strlen(thousands) > 1.
	Honour width correctly in the presence of floating
	decimal points and thousands separators.
	* stdio-common/tst-sscanf.c: New test.
	* stdio-common/Makefile: Add it to tests.
	* sysdeps/generic/strtol.c (strtol): Fix conversion if there are
	thousands separators and group argument is non-zero.

	Reported by Andi Kleen <ak@suse.de>.
Diffstat (limited to 'locale/indigitswc.h')
-rw-r--r--locale/indigitswc.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/locale/indigitswc.h b/locale/indigitswc.h
index 7bd871527e..9abe98e63b 100644
--- a/locale/indigitswc.h
+++ b/locale/indigitswc.h
@@ -48,6 +48,7 @@ indigitwc_value (wchar_t wc, int *decided)
     {
       /* Get the string for the digits with value N.  */
       wcdigits[n] = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n);
+      wcdigits[n] += from_level;
 
       if (wc == *wcdigits[n])
 	{
@@ -78,9 +79,6 @@ indigitwc_value (wchar_t wc, int *decided)
 	  /* Advance the pointer to the next string.  */
 	  ++wcdigits[n];
 	}
-
-      /* Next level.  */
-      ++from_level;
     }
 
   /* If we reach this point no matching digit was found.  */