diff options
| author | nigel <nigel@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-02-24 21:39:21 +0000 |
|---|---|---|
| committer | nigel <nigel@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-02-24 21:39:21 +0000 |
| commit | 09f9da9675b33a31c605d9d1f913bc2b05522be2 (patch) | |
| tree | e4e2b0bbc47b23f497e3f1b2208a9ac9a9d4ebea /pcreposix.c | |
| parent | 1622a3e7058dec7de74889c69595693ac0c64187 (diff) | |
| download | pcre-09f9da9675b33a31c605d9d1f913bc2b05522be2.tar.gz | |
Load pcre-3.0 into code/trunk.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@43 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcreposix.c')
| -rw-r--r-- | pcreposix.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pcreposix.c b/pcreposix.c index 12606af..7c66cce 100644 --- a/pcreposix.c +++ b/pcreposix.c @@ -12,7 +12,7 @@ functions. Written by: Philip Hazel <ph10@cam.ac.uk> - Copyright (c) 1997-1999 University of Cambridge + Copyright (c) 1997-2000 University of Cambridge ----------------------------------------------------------------------------- Permission is granted to anyone to use this software for any purpose on any @@ -46,7 +46,8 @@ restrictions: static const char *estring[] = { ERR1, ERR2, ERR3, ERR4, ERR5, ERR6, ERR7, ERR8, ERR9, ERR10, ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20, - ERR21, ERR22, ERR23, ERR24, ERR25 }; + ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR29, ERR29, ERR30, + ERR31 }; static int eint[] = { REG_EESCAPE, /* "\\ at end of pattern" */ @@ -76,7 +77,10 @@ static int eint[] = { REG_BADPAT, /* "lookbehind assertion is not fixed length" */ REG_BADPAT, /* "malformed number after (?(" */ REG_BADPAT, /* "conditional group containe more than two branches" */ - REG_BADPAT /* "assertion expected after (?(" */ + REG_BADPAT, /* "assertion expected after (?(" */ + REG_BADPAT, /* "(?p must be followed by )" */ + REG_ECTYPE, /* "unknown POSIX class name" */ + REG_BADPAT /* "POSIX collating elements are not supported" */ }; /* Table of texts corresponding to POSIX error codes */ @@ -231,7 +235,7 @@ preg->re_erroffset = (size_t)(-1); /* Only has meaning after compile */ if (nmatch > 0) { - ovector = malloc(sizeof(int) * nmatch * 3); + ovector = (int *)malloc(sizeof(int) * nmatch * 3); if (ovector == NULL) return REG_ESPACE; } |