From: Jim Meyering Date: Sat, 27 Jan 2007 09:44:43 +0000 (+0000) Subject: * lib/regex_internal.c (re_string_reconstruct): Remove declaration X-Git-Tag: cvs-readonly~1242 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=4eb496cca61ea52a08317b0705b6f27282640868;p=gnulib.git * lib/regex_internal.c (re_string_reconstruct): Remove declaration of set-but-not-used local, "q". --- diff --git a/ChangeLog b/ChangeLog index e66395cc7..c66ebfb24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-01-27 Jim Meyering + * lib/regex_internal.c (re_string_reconstruct): Remove declaration + of set-but-not-used local, "q". + * lib/mempcpy.c: Include before . This fixes a compilation error on HP-UX, due to the system's "restrict"-using mempcpy prototype. diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 78e16f330..21298889a 100644 --- 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 . @@ -706,7 +707,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) 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 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) 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). */