2005-01-14  Ulrich Drepper  <drepper@redhat.com>

	* posix/regcomp.c [!_LIBC] (init_dfa): Fix determining of relevant
	LC_* variable.  Patch by Aharon Robbins <arnold@skeeve.com>.

	* stdlib/fmtmsg.c (internal_addseverity): Remove incorrect free call.
	* stdlib/tst-fmtmsg.c (main): Add another addseverity test.
This commit is contained in:
Ulrich Drepper 2005-01-14 09:06:25 +00:00
parent 3e539cb47e
commit ea16166114
4 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,11 @@
2005-01-14 Ulrich Drepper <drepper@redhat.com>
* posix/regcomp.c [!_LIBC] (init_dfa): Fix determining of relevant
LC_* variable. Patch by Aharon Robbins <arnold@skeeve.com>.
* stdlib/fmtmsg.c (internal_addseverity): Remove incorrect free call.
* stdlib/tst-fmtmsg.c (main): Add another addseverity test.
2005-01-12 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_map_object_from_fd): We don't have to allow

View File

@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@ -894,9 +894,9 @@ init_dfa (dfa, pat_len)
codeset_name = nl_langinfo (CODESET);
# else
codeset_name = getenv ("LC_ALL");
if (codeset_name == NULL || codeset[0] == '\0')
if (codeset_name == NULL || codeset_name[0] == '\0')
codeset_name = getenv ("LC_CTYPE");
if (codeset_name == NULL || codeset[0] == '\0')
if (codeset_name == NULL || codeset_name[0] == '\0')
codeset_name = getenv ("LANG");
if (codeset_name == NULL)
codeset_name = "";
@ -1164,7 +1164,7 @@ optimize_subexps (so, node, sidx, depth)
&& so->nodes[node->left->node_idx].type == OP_OPEN_SUBEXP
? depth + 1 : 0;
node->right = optimize_subexps (so, node->right, sidx, new_depth);
if (node->type != CONCAT)
return node;
if ((depth & 1) == 0

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
/* Copyright (C) 1997,1999,2000-2003,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -324,9 +324,6 @@ internal_addseverity (int severity, const char *string)
if (runp != NULL)
{
/* Release old string. */
free ((char *) runp->string);
if (string != NULL)
/* Change the string. */
runp->string = string;

View File

@ -48,5 +48,11 @@ main (void)
!= MM_OK)
result = 1;
if (addseverity (MM_TEST, NULL) != MM_OK)
{
puts ("second addseverity failed");
result = 1;
}
return result;
}