Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
2002-07-15  Ulrich Drepper  <drepper@redhat.com>

	* intl/tst-gettext.sh: Pass -f option to msgfmt.
	* intl/tst-gettext.c: Correctly handle untranslated messages in
	positive tests.

	* po/de.po: Update from translation team.
  • Loading branch information
Ulrich Drepper committed Jul 16, 2002
1 parent a99bfa8 commit d2afebc
Show file tree
Hide file tree
Showing 9 changed files with 2,587 additions and 1,579 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2002-07-15 Ulrich Drepper <drepper@redhat.com>

* intl/tst-gettext.sh: Pass -f option to msgfmt.
* intl/tst-gettext.c: Correctly handle untranslated messages in
positive tests.

* po/de.po: Update from translation team.

2002-07-02 H.J. Lu <hjl@gnu.org>

* sysdeps/mips/atomicity.h: Don't include <sgidefs.h>. Always
Expand Down
14 changes: 10 additions & 4 deletions intl/tst-gettext.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Test of the gettext functions.
Copyright (C) 2000 Free Software Foundation, Inc.
Copyright (C) 2000, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
Expand Down Expand Up @@ -235,7 +235,9 @@ positive_gettext_test (void)
{
const char *found = gettext (msgs[cnt].msgid);

if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0)
if (found == NULL
|| (msgs[cnt].msgstr[0] != '\0'
&& strcmp (found, msgs[cnt].msgstr) != 0))
{
/* Oops, shouldn't happen. */
printf ("\
Expand Down Expand Up @@ -281,7 +283,9 @@ positive_dgettext_test (const char *domain)
{
const char *found = dgettext (domain, msgs[cnt].msgid);

if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0)
if (found == NULL
|| (msgs[cnt].msgstr[0] != '\0'
&& strcmp (found, msgs[cnt].msgstr) != 0))
{
/* Oops, shouldn't happen. */
printf ("\
Expand All @@ -305,7 +309,9 @@ positive_dcgettext_test (const char *domain, int category)
{
const char *found = dcgettext (domain, msgs[cnt].msgid, category);

if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0)
if (found == NULL
|| (msgs[cnt].msgstr[0] != '\0'
&& strcmp (found, msgs[cnt].msgstr) != 0))
{
/* Oops, shouldn't happen. */
printf ("\
Expand Down
4 changes: 2 additions & 2 deletions intl/tst-gettext.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ test -d ${objpfx}localedir/existing-locale/LC_MESSAGES || {

# Populate them.
msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/existing-domain.mo \
../po/de.po
-f ../po/de.po
msgfmt -o ${objpfx}domaindir/existing-locale/LC_TIME/existing-time-domain.mo \
../po/de.po
-f ../po/de.po

GCONV_PATH=${common_objpfx}iconvdata
export GCONV_PATH
Expand Down
8 changes: 8 additions & 0 deletions linuxthreads_db/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2002-07-15 Ulrich Drepper <drepper@redhat.com>

* td_ta_thr_iter.c: Some more changes to enable using TLS-enabled
libpthread.
* td_thr_event_enable.c: Likewise.
* td_thr_getfpregs.c: Likewise.
* td_thr_getgregs.c: Likewise.

2002-07-14 Ulrich Drepper <drepper@redhat.com>

* td_ta_map_id2thr.c: Begin fixing implementation for libpthread with
Expand Down
2 changes: 1 addition & 1 deletion linuxthreads_db/td_ta_thr_iter.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ handle_descr (const td_thragent_t *ta, td_thr_iter_f *callback,
p_userstack but this should not be necessary here. */

th.th_ta_p = (td_thragent_t *) ta;
th.th_unique = &pds;
th.th_unique = NULL;
if (callback (&th, cbdata_p) != 0)
return TD_DBERR;

Expand Down
1 change: 1 addition & 0 deletions linuxthreads_db/td_thr_event_enable.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ td_thr_event_enable (th, onoff)
LOG ("td_thr_event_enable");

/* Write the new value into the thread data structure. */
if (th->th_unique != NULL)
if (ps_pdwrite (th->th_ta_p->ph,
((char *) th->th_unique
+ offsetof (struct _pthread_descr_struct, p_report_events)),
Expand Down
6 changes: 6 additions & 0 deletions linuxthreads_db/td_thr_getfpregs.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ td_thr_getfpregs (const td_thrhandle_t *th, prfpregset_t *regset)

LOG ("td_thr_getfpregs");

if (th->th_unique == NULL)
{
memset (regset, '\0', sizeof (*regset));
return TD_OK;
}

/* We have to get the state and the PID for this thread. */
if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
sizeof (struct _pthread_descr_struct)) != PS_OK)
Expand Down
7 changes: 7 additions & 0 deletions linuxthreads_db/td_thr_getgregs.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ td_thr_getgregs (const td_thrhandle_t *th, prgregset_t gregs)

LOG ("td_thr_getgregs");

if (th->th_unique == NULL)
{
/* No data yet. */
memset (gregs, '\0', sizeof (prgregset_t));
return TD_OK;
}

/* We have to get the state and the PID for this thread. */
if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
sizeof (struct _pthread_descr_struct)) != PS_OK)
Expand Down
Loading

0 comments on commit d2afebc

Please sign in to comment.