about summary refs log tree commit diff
path: root/locale/programs/linereader.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-27 05:05:12 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-27 05:05:12 +0000
commit70e51ab9f37ec84b23ff5e090e0d9a322baf523d (patch)
tree1891740b82b92c022c072834b979196199ae0b93 /locale/programs/linereader.c
parentc392db7c4be39bf2ad8668f6e75a1ec219da6b0e (diff)
downloadglibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.gz
glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.xz
glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.zip
Update.
	* locale/programs/ld-collate.c (collate_output): Don't start with empty
	extrapool and indirectpool obstacks since we need the offsets to be
	nonzero.
	(collate_read): Call load_locale, not find_locale.
	* locale/programs/ld-ctype.c (ctype_finish): If LC_CTYPE category
	wasn't defined in the file also initialize repertoire if possible.
	* locale/programs/ld-time.c (time_finish): Fix message string.
	* locale/programs/linereader.c: Cast parameters of lr_error to
	correct type to prevnet warning.
	* locale/programs/localedef.c (load_locale): New file.
	* locale/programs/localedef.h: Add its prototype.
	* locale/programs/repertoire.c (repertoire_new_char): Add missing
	parameters to lr_error call.

	* localedata/Makefile: Enable running tests again.
	* localedata/tests/test2.def: Adjust syntax to new specification.
	* localedata/tests/test3.def: Likewise.
	* localedata/tst-trans.sh: Redirect output of program into file.

	* string/strcoll.c: Fix many error in new implementation to make it
	pass (at least) the test suite.

	* locale/Makefile: Don't link localedef statically anymore.

	* locale/ld-collate.c (struct element_t): Add field is_character and
	use it to distinguish real character from collating elements and
	symbols.
	* locale/programs/ld-time.c: Likewise.
Diffstat (limited to 'locale/programs/linereader.c')
-rw-r--r--locale/programs/linereader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index 564173083e..c689153bda 100644
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -711,7 +711,7 @@ non-symbolic character value should not be used"));
 		{
 		  /* This name is not in the repertoire map.  */
 		  lr_error (lr, _("symbol `%.*s' not in repertoire map"),
-			    bufact - startidx, &buf[startidx]);
+			    (int) (bufact - startidx), &buf[startidx]);
 		  illegal_string = 1;
 		}
 	      else
@@ -726,7 +726,7 @@ non-symbolic character value should not be used"));
 	    {
 	      /* This name is not in the charmap.  */
 	      lr_error (lr, _("symbol `%.*s' not in charmap"),
-			bufact - startidx, &buf[startidx]);
+			(int) (bufact - startidx), &buf[startidx]);
 	      illegal_string = 1;
 
 	      /* Now forget about the name we just added.  */