diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2010-03-30 11:11:52 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2010-03-30 11:11:52 +0000 |
commit | f519d354b9128f7f7928c0b3143519b230a45703 (patch) | |
tree | 1eca4e5310378e18278399e6c89f075ad192bafe /pcretest.c | |
parent | 2c66be81f5e01386a2f9ff1d49d46fc1a1051e1a (diff) | |
download | pcre-f519d354b9128f7f7928c0b3143519b230a45703.tar.gz |
Fix compile problems when heap is in use
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@512 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcretest.c')
-rw-r--r-- | pcretest.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1040,13 +1040,13 @@ while (!done) #endif const char *error; - unsigned char *markptr; + unsigned char *markptr; unsigned char *p, *pp, *ppp; unsigned char *to_file = NULL; const unsigned char *tables = NULL; unsigned long int true_size, true_study_size = 0; size_t size, regex_gotten_store; - int do_mark = 0; + int do_mark = 0; int do_study = 0; int do_debug = debug; int do_G = 0; @@ -1228,7 +1228,7 @@ while (!done) case 'G': do_G = 1; break; case 'I': do_showinfo = 1; break; case 'J': options |= PCRE_DUPNAMES; break; - case 'K': do_mark = 1; break; + case 'K': do_mark = 1; break; case 'M': log_store = 1; break; case 'N': options |= PCRE_NO_AUTO_CAPTURE; break; @@ -1422,9 +1422,9 @@ while (!done) else if (extra != NULL) true_study_size = ((pcre_study_data *)(extra->study_data))->size; } - + /* If /K was present, we set up for handling MARK data. */ - + if (do_mark) { if (extra == NULL) @@ -1432,9 +1432,9 @@ while (!done) extra = (pcre_extra *)malloc(sizeof(pcre_extra)); extra->flags = 0; } - extra->mark = &markptr; + extra->mark = &markptr; extra->flags |= PCRE_EXTRA_MARK; - } + } /* If the 'F' option was present, we flip the bytes of all the integer fields in the regex data block and the study block. This is to make it @@ -2161,8 +2161,8 @@ while (!done) for (;; gmatched++) /* Loop for /g or /G */ { - markptr = NULL; - + markptr = NULL; + if (timeitm > 0) { register int i; @@ -2307,7 +2307,7 @@ while (!done) } } } - + if (markptr != NULL) fprintf(outfile, "MK: %s\n", markptr); for (i = 0; i < 32; i++) @@ -2461,11 +2461,11 @@ while (!done) { if (count == PCRE_ERROR_NOMATCH) { - if (gmatched == 0) + if (gmatched == 0) { if (markptr == NULL) fprintf(outfile, "No match\n"); else fprintf(outfile, "No match, mark = %s\n", markptr); - } + } } else fprintf(outfile, "Error %d\n", count); break; /* Out of the /g loop */ |