Mercurial > hg > octave-lyh > gnulib-hg
changeset 7976:caf7dcb02c3d
* lib/regex_internal.c (re_string_reconstruct): Remove declaration
of set-but-not-used local, "q".
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sat, 27 Jan 2007 09:44:43 +0000 |
parents | 4c56bddfd956 |
children | 0de2d8f42126 |
files | ChangeLog lib/regex_internal.c |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-01-27 Jim Meyering <jim@meyering.net> + * lib/regex_internal.c (re_string_reconstruct): Remove declaration + of set-but-not-used local, "q". + * lib/mempcpy.c: Include <config.h> before <string.h>. This fixes a compilation error on HP-UX, due to the system's "restrict"-using mempcpy prototype.
--- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,6 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software + Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -706,7 +707,7 @@ if (pstr->is_utf8) { - const unsigned char *raw, *p, *q, *end; + const unsigned char *raw, *p, *end; /* Special case UTF-8. Multi-byte chars start with any byte other than 0x80 - 0xbf. */ @@ -735,13 +736,11 @@ unsigned char buf[6]; size_t mbclen; - q = p; if (BE (pstr->trans != NULL, 0)) { int i = mlen < 6 ? mlen : 6; while (--i >= 0) buf[i] = pstr->trans[p[i]]; - q = buf; } /* XXX Don't use mbrtowc, we know which conversion to use (UTF-8 -> UCS4). */