summaryrefslogtreecommitdiff
path: root/pcre_get.c
diff options
context:
space:
mode:
authorzherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>2012-01-16 08:35:42 +0000
committerzherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>2012-01-16 08:35:42 +0000
commitc79fd890ec446bf923ba9d4f16e54908db38df29 (patch)
treeecafc83a1b7f88a6dd9f00605ebaa645cb79bf80 /pcre_get.c
parent5e65b4b723e9252019890e3e6118e5b4fab5169d (diff)
downloadpcre-c79fd890ec446bf923ba9d4f16e54908db38df29.tar.gz
Fix compiler warnings
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@883 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_get.c')
-rw-r--r--pcre_get.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/pcre_get.c b/pcre_get.c
index 6c61b02..3d9904e 100644
--- a/pcre_get.c
+++ b/pcre_get.c
@@ -236,18 +236,21 @@ get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector)
{
const REAL_PCRE *re = (const REAL_PCRE *)code;
int entrysize;
-pcre_uchar *first, *last;
pcre_uchar *entry;
#ifdef COMPILE_PCRE8
+char *first, *last;
+#else
+PCRE_UCHAR16 *first, *last;
+#endif
+
+#ifdef COMPILE_PCRE8
if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
return pcre_get_stringnumber(code, stringname);
-entrysize = pcre_get_stringtable_entries(code, stringname,
- (char **)&first, (char **)&last);
+entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last);
#else
if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
return pcre16_get_stringnumber(code, stringname);
-entrysize = pcre16_get_stringtable_entries(code, stringname,
- (PCRE_UCHAR16 **)&first, (PCRE_UCHAR16 **)&last);
+entrysize = pcre16_get_stringtable_entries(code, stringname, &first, &last);
#endif
if (entrysize <= 0) return entrysize;
for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)