diff options
| author | john haque <j.eh@mchsi.com> | 2012-04-17 13:00:13 -0500 |
|---|---|---|
| committer | john haque <j.eh@mchsi.com> | 2012-04-17 13:00:13 -0500 |
| commit | b1062311a3caab9ec89c0f104bd9b4334174f23c (patch) | |
| tree | 08a64713888026fb80fd80360343a51aebd8a593 /regex_internal.h | |
| parent | e729adf120f279fd65578a410ca8d2d93a56f0f0 (diff) | |
| parent | f0345a29c71a3215adaa0e2fdfefc0c439ea6561 (diff) | |
| download | egawk-b1062311a3caab9ec89c0f104bd9b4334174f23c.tar.gz egawk-b1062311a3caab9ec89c0f104bd9b4334174f23c.tar.bz2 egawk-b1062311a3caab9ec89c0f104bd9b4334174f23c.zip | |
Merge branch 'master' into gawk_mpfr.
Diffstat (limited to 'regex_internal.h')
| -rw-r--r-- | regex_internal.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/regex_internal.h b/regex_internal.h index 5fcab48a..f38a13b0 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2005, 2007, 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2002-2005, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -14,9 +14,8 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ #ifndef _REGEX_INTERNAL_H #define _REGEX_INTERNAL_H 1 @@ -783,7 +782,6 @@ re_string_elem_size_at (const re_string_t *pstr, int idx) # ifdef _LIBC const unsigned char *p, *extra; const int32_t *table, *indirect; - int32_t tmp; # include <locale/weight.h> uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); @@ -795,7 +793,7 @@ re_string_elem_size_at (const re_string_t *pstr, int idx) indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); p = pstr->mbs + idx; - tmp = findidx (&p); + findidx (&p, pstr->len - idx); return p - pstr->mbs - idx; } else |