summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-04-17 15:55:53 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-04-17 15:55:53 +0000
commit5fd059193d4e67c21e33e6d6c3866078fddf958f (patch)
tree44ef966caacc3460a73b82e9f9e015cbe71e505f
parent3c36bde64832e5c3b8a89b19680bf408fa98a0b7 (diff)
downloadpcre-5fd059193d4e67c21e33e6d6c3866078fddf958f.tar.gz
Typos in the docs, missing casts and #ifdefs in the code.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@152 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog10
-rw-r--r--doc/html/pcretest.html2
-rw-r--r--doc/pcretest.12
-rw-r--r--doc/pcretest.txt2
-rw-r--r--pcre_dfa_exec.c4
-rw-r--r--pcregrep.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index eb8b34e..412a40f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -142,12 +142,12 @@ Version 7.1 12-Mar-07
21. Added PCRE_NEWLINE_ANYCRLF which is like ANY, but matches only CR, LF, or
CRLF as a newline sequence.
-
+
22. Code for handling Unicode properties in pcre_dfa_exec() wasn't being cut
- out by #ifdef SUPPORT_UCP. This did no harm, as it could never be used, but
- I have nevertheless tidied it up.
-
-23. Added some casts to kill warnings from HP-UX ia64 compiler.
+ out by #ifdef SUPPORT_UCP. This did no harm, as it could never be used, but
+ I have nevertheless tidied it up.
+
+23. Added some casts to kill warnings from HP-UX ia64 compiler.
Version 7.0 19-Dec-06
diff --git a/doc/html/pcretest.html b/doc/html/pcretest.html
index 680a4d2..c041a9c 100644
--- a/doc/html/pcretest.html
+++ b/doc/html/pcretest.html
@@ -202,7 +202,7 @@ not correspond to anything in Perl:
<b>/&#60;cr&#62;</b> PCRE_NEWLINE_CR
<b>/&#60;lf&#62;</b> PCRE_NEWLINE_LF
<b>/&#60;crlf&#62;</b> PCRE_NEWLINE_CRLF
- <b>/&#60;anycrlf&#62;</b> PCRE_NEWLINE_ANY
+ <b>/&#60;anycrlf&#62;</b> PCRE_NEWLINE_ANYCRLF
<b>/&#60;any&#62;</b> PCRE_NEWLINE_ANY
</pre>
Those specifying line ending sequencess are literal strings as shown. This
diff --git a/doc/pcretest.1 b/doc/pcretest.1
index 57e2e1d..c2d2b04 100644
--- a/doc/pcretest.1
+++ b/doc/pcretest.1
@@ -168,7 +168,7 @@ not correspond to anything in Perl:
\fB/<cr>\fP PCRE_NEWLINE_CR
\fB/<lf>\fP PCRE_NEWLINE_LF
\fB/<crlf>\fP PCRE_NEWLINE_CRLF
- \fB/<anycrlf>\fP PCRE_NEWLINE_ANY
+ \fB/<anycrlf>\fP PCRE_NEWLINE_ANYCRLF
\fB/<any>\fP PCRE_NEWLINE_ANY
.sp
Those specifying line ending sequencess are literal strings as shown. This
diff --git a/doc/pcretest.txt b/doc/pcretest.txt
index c071b03..06bee98 100644
--- a/doc/pcretest.txt
+++ b/doc/pcretest.txt
@@ -157,7 +157,7 @@ PATTERN MODIFIERS
/<cr> PCRE_NEWLINE_CR
/<lf> PCRE_NEWLINE_LF
/<crlf> PCRE_NEWLINE_CRLF
- /<anycrlf> PCRE_NEWLINE_ANY
+ /<anycrlf> PCRE_NEWLINE_ANYCRLF
/<any> PCRE_NEWLINE_ANY
Those specifying line ending sequencess are literal strings as shown.
diff --git a/pcre_dfa_exec.c b/pcre_dfa_exec.c
index ba31ecc..ef4a13f 100644
--- a/pcre_dfa_exec.c
+++ b/pcre_dfa_exec.c
@@ -500,9 +500,9 @@ for (;;)
const uschar *code;
int state_offset = current_state->offset;
int count, codevalue;
-#ifdef SUPPORT_UCP
+#ifdef SUPPORT_UCP
int chartype, script;
-#endif
+#endif
#ifdef DEBUG
printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
diff --git a/pcregrep.c b/pcregrep.c
index 0fc9008..f14c973 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -1644,7 +1644,7 @@ for (i = 1; i < argc; i++)
char buff2[24];
int baselen = opbra - op->long_name;
sprintf(buff1, "%.*s", baselen, op->long_name);
- sprintf(buff2, "%s%.*s", buff1,
+ sprintf(buff2, "%s%.*s", buff1,
(int)strlen(op->long_name) - baselen - 2, opbra + 1);
if (strcmp(arg, buff1) == 0 || strcmp(arg, buff2) == 0)
break;