OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2000-10-25  Ulrich Drepper  <drepper@redhat.com>

	* intl/Makefile (tests): Add tst-ngettext.
	* intl/tst-ngettext.c: New file.
This commit is contained in:
Ulrich Drepper 2000-10-26 02:58:22 +00:00
parent 1410e233be
commit 1267f93e16
4 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-10-25 Ulrich Drepper <drepper@redhat.com>
* intl/Makefile (tests): Add tst-ngettext.
* intl/tst-ngettext.c: New file.
2000-10-25 Bruno Haible <haible@clisp.cons.org>
* manual/charset.texi: Fix spelling of __GCONV_FULL_OUTPUT.

1
intl/Makefile
View File

@ -29,6 +29,7 @@ distribute = gettext.h gettextP.h hash-string.h loadinfo.h locale.alias \
translit.po
test-srcs := tst-gettext tst-translit
tests = tst-ngettext
before-compile = $(objpfx)msgs.h

65
intl/tst-ngettext.c Normal file
View File

@ -0,0 +1,65 @@
/* Test of the ngettext functions.
Copyright (C) 2000 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <langinfo.h>
#include <libintl.h>
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int
main (void)
{
const char *strs[2] = { "singular", "plural" };
unsigned long int i;
int res = 0;
/* We don't want any translation here. */
setenv ("LANGUAGE", "C", 1);
unsetenv ("OUTPUT_CHARSET");
for (i = 0; i < 30; ++i)
{
char *tr;
tr = ngettext (strs[0], strs[1], i);
#define TEST \
do \
if (tr != strs[i != 1]) \
{ \
if (strcmp (tr, strs[i != 1]) == 0) \
printf ("%lu: correct string, wrong pointer (%s)\n", i, tr); \
else \
printf ("%lu: wrong result (%s)\n", i, tr); \
res = 1; \
} \
while (0)
TEST;
tr = dngettext ("messages", strs[0], strs[1], i);
TEST;
tr = dcngettext ("messages", strs[0], strs[1], i, LC_MESSAGES);
TEST;
}
return res;
}

6
linuxthreads/ChangeLog
View File

@ -1,3 +1,9 @@
2000-10-26 Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Yutaka Niibe <gniibe@chroot.org>
* sysdeps/sh/pt-machine.h (testandset): Since the operand of TAS.B
has restrictions, use register.
2000-10-23 Andreas Schwab <schwab@suse.de>
* Examples/ex14.c (TIMEOUT): Override default timeout.