diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-11-21 10:48:42 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-11-21 10:48:42 +0000 |
commit | c48ca85a9456be9a04cb0b92df853d6dac797414 (patch) | |
tree | b3bc521693c1cabe0b24ded1d6b21bc6420fc15a /pcre_get.c | |
parent | 7621a7a2aaf2c80118e6d43a3689f010f5d09b92 (diff) | |
download | pcre-c48ca85a9456be9a04cb0b92df853d6dac797414.tar.gz |
Apply Zoltan's big patch.
git-svn-id: svn://vcs.exim.org/pcre/code/branches/pcre16@756 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_get.c')
-rw-r--r-- | pcre_get.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -71,7 +71,7 @@ pcre_get_stringnumber(const pcre *code, const char *stringname) int rc; int entrysize; int top, bot; -uschar *nametable; +pcre_uchar *nametable; if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0) return rc; @@ -86,7 +86,7 @@ bot = 0; while (top > bot) { int mid = (top + bot) / 2; - uschar *entry = nametable + entrysize*mid; + pcre_uchar *entry = nametable + entrysize*mid; int c = strcmp(stringname, (char *)(entry + 2)); if (c == 0) return (entry[0] << 8) + entry[1]; if (c > 0) bot = mid + 1; else top = mid; @@ -121,7 +121,7 @@ pcre_get_stringtable_entries(const pcre *code, const char *stringname, int rc; int entrysize; int top, bot; -uschar *nametable, *lastentry; +pcre_uchar *nametable, *lastentry; if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0) return rc; @@ -137,12 +137,12 @@ bot = 0; while (top > bot) { int mid = (top + bot) / 2; - uschar *entry = nametable + entrysize*mid; + pcre_uchar *entry = nametable + entrysize*mid; int c = strcmp(stringname, (char *)(entry + 2)); if (c == 0) { - uschar *first = entry; - uschar *last = entry; + pcre_uchar *first = entry; + pcre_uchar *last = entry; while (first > nametable) { if (strcmp(stringname, (char *)(first - entrysize + 2)) != 0) break; @@ -188,12 +188,12 @@ get_first_set(const pcre *code, const char *stringname, int *ovector) const real_pcre *re = (const real_pcre *)code; int entrysize; char *first, *last; -uschar *entry; +pcre_uchar *entry; if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0) return pcre_get_stringnumber(code, stringname); entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last); if (entrysize <= 0) return entrysize; -for (entry = (uschar *)first; entry <= (uschar *)last; entry += entrysize) +for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize) { int n = (entry[0] << 8) + entry[1]; if (ovector[n*2] >= 0) return n; |