summaryrefslogtreecommitdiff
path: root/pcre_fullinfo.c
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-09-10 13:23:56 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-09-10 13:23:56 +0000
commit6daf21e6a650630d1ef31720c2f92f555127fe80 (patch)
tree6b7dd8ba7db2c55f02e5fd9dc1313d623e5c5f0b /pcre_fullinfo.c
parent828dc418a519f86a907e0dd989e59bf15893a38e (diff)
downloadpcre-6daf21e6a650630d1ef31720c2f92f555127fe80.tar.gz
(1) Move internal flags out of the options field, to make room.
(2) \r and \n must be explicit to trigger the special CRLF handline exception. (3) (?J) at the start now sets JCHANGED as well as DUPNAMES. git-svn-id: svn://vcs.exim.org/pcre/code/trunk@230 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_fullinfo.c')
-rw-r--r--pcre_fullinfo.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pcre_fullinfo.c b/pcre_fullinfo.c
index b082473..cb0993f 100644
--- a/pcre_fullinfo.c
+++ b/pcre_fullinfo.c
@@ -110,8 +110,8 @@ switch (what)
case PCRE_INFO_FIRSTBYTE:
*((int *)where) =
- ((re->options & PCRE_FIRSTSET) != 0)? re->first_byte :
- ((re->options & PCRE_STARTLINE) != 0)? -1 : -2;
+ ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte :
+ ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
break;
/* Make sure we pass back the pointer to the bit vector in the external
@@ -125,7 +125,7 @@ switch (what)
case PCRE_INFO_LASTLITERAL:
*((int *)where) =
- ((re->options & PCRE_REQCHSET) != 0)? re->req_byte : -1;
+ ((re->flags & PCRE_REQCHSET) != 0)? re->req_byte : -1;
break;
case PCRE_INFO_NAMEENTRYSIZE:
@@ -145,15 +145,15 @@ switch (what)
break;
case PCRE_INFO_OKPARTIAL:
- *((int *)where) = (re->options & PCRE_NOPARTIAL) == 0;
+ *((int *)where) = (re->flags & PCRE_NOPARTIAL) == 0;
break;
case PCRE_INFO_JCHANGED:
- *((int *)where) = (re->options & PCRE_JCHANGED) != 0;
+ *((int *)where) = (re->flags & PCRE_JCHANGED) != 0;
break;
case PCRE_INFO_HASCRORLF:
- *((int *)where) = (re->options & PCRE_HASCRORLF) != 0;
+ *((int *)where) = (re->flags & PCRE_HASCRORLF) != 0;
break;
default: return PCRE_ERROR_BADOPTION;