Source tidies for 8.21

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@797 2f5784b3-3f2a-0410-8824-cb99058d5e15

5 files changed, 23 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index d2b7dc2..81eaf17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 ChangeLog for PCRE
 ------------------
 
-Version 8.21 05-Dec-2011
+Version 8.21 12-Dec-2011
 ------------------------
 
 1.  Updating the JIT compiler.
@@ -103,13 +103,13 @@ Version 8.21 05-Dec-2011
 25. The CheckMan script was not being included in the distribution. Also, added
     an explicit "perl" to run Perl scripts from the PrepareRelease script
     because this is reportedly needed in Windows.
-    
+
 26. If study data was being save in a file and studying had not found a set of
-    "starts with" bytes for the pattern, the data written to the file (though 
+    "starts with" bytes for the pattern, the data written to the file (though
     never used) was taken from uninitialized memory and so caused valgrind to
-    complain.  
-    
-27. Updated RunTest.bat as provided by Sheri Pierce. 
+    complain.
+
+27. Updated RunTest.bat as provided by Sheri Pierce.
 
 28. Fixed a possible uninitialized memory bug in pcre_jit_compile.c.
 
diff --git a/NEWS b/NEWS
index 4815280..28d676d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
 News about PCRE releases
 ------------------------
 
-Release 8.21 05-Dec-2011
+Release 8.21 12-Dec-2011
 ------------------------
 
-This is mostly a bug-fix release. The only new feature is the ability to obtain
-the memory used by the JIT compiler.
+This is almost entirely a bug-fix release. The only new feature is the ability
+to obtain the size of the memory used by the JIT compiler.
 
 
 Release 8.20 21-Oct-2011
diff --git a/configure.ac b/configure.ac
index ea97c35..260970f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
 
 m4_define(pcre_major, [8])
 m4_define(pcre_minor, [21])
-m4_define(pcre_prerelease, [-RC1])
-m4_define(pcre_date, [2011-12-05])
+m4_define(pcre_prerelease, [])
+m4_define(pcre_date, [2011-12-12])
 
 # Libtool shared library interface versions (current:revision:age)
 m4_define(libpcre_version, [0:1:0])
diff --git a/maint/ManyConfigTests b/maint/ManyConfigTests
index fc5e4e8..6a61f84 100755
--- a/maint/ManyConfigTests
+++ b/maint/ManyConfigTests
@@ -141,6 +141,10 @@ function runtest()
 # builds both) to save a bit of time by building only one version of the
 # library for the subsequent tests.
 
+valgrind=
+cvalgrind=
+withvalgrind=
+
 echo "Tests in the current directory"
 srcdir=.
 for opts in \
@@ -179,10 +183,13 @@ do
   runtest
 done
 
+valgrind=
+cvalgrind=
+withvalgrind=
+
 # Clean up the distribution and then do at least one build and test in a
 # directory other than the source directory. It doesn't work unless the
-# source directory is cleaned up first - and anyway, it's best to leave it
-# in a clean state after all this reconfiguring.
+# source directory is cleaned up first.
 
 if [ -f Makefile ]; then
   echo "Running 'make distclean'"
diff --git a/pcre_study.c b/pcre_study.c
index 20e064a..cb2f23e 100644
--- a/pcre_study.c
+++ b/pcre_study.c
@@ -1321,12 +1321,12 @@ if (bits_set || min > 0
 
   study->size = sizeof(pcre_study_data);
   study->flags = 0;
-  
+
   /* Set the start bits always, to avoid unset memory errors if the
   study data is written to a file, but set the flag only if any of the bits
-  are set, to save time looking when none are. */  
+  are set, to save time looking when none are. */
 
-  if (bits_set) 
+  if (bits_set)
     {
     study->flags |= PCRE_STUDY_MAPPED;
     memcpy(study->start_bits, start_bits, sizeof(start_bits));