Removal of trailing spaces.

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

17 files changed, 100 insertions, 92 deletions

diff --git a/ChangeLog b/ChangeLog
index d23d4cd..7f6f633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,7 +26,7 @@ Version 7.1 12-Mar-07
     .br or .in.
 
  4. Updated comments in configure.ac that get placed in config.h.in and also
-    arranged for config.h to be included in the distribution, with the name 
+    arranged for config.h to be included in the distribution, with the name
     config.h.generic, for the benefit of those who have to compile without
     Autotools (compare pcre.h, which is now distributed as pcre.h.generic).
 
@@ -63,59 +63,59 @@ Version 7.1 12-Mar-07
 10. Fixed two bugs in the emulated memmove() function in pcre_internal.h:
 
     (a) It was defining its arguments as char * instead of void *.
-     
-    (b) It was assuming that all moves were upwards in memory; this was true 
-        a long time ago when I wrote it, but is no longer the case. 
+
+    (b) It was assuming that all moves were upwards in memory; this was true
+        a long time ago when I wrote it, but is no longer the case.
 
     The emulated memove() is provided for those environments that have neither
-    memmove() nor bcopy(). I didn't think anyone used it these days, but that 
+    memmove() nor bcopy(). I didn't think anyone used it these days, but that
     is clearly not the case, as these two bugs were recently reported.
-    
+
 11. The script PrepareRelease is now distributed: it calls 132html, CleanTxt,
-    and Detrail to create the HTML documentation, the .txt form of the man 
-    pages, and it removes trailing spaces from listed files. It also creates 
-    pcre.h.generic and config.h.generic from pcre.h and config.h. In the latter 
-    case, it wraps all the #defines with #ifndefs. This script should be run 
+    and Detrail to create the HTML documentation, the .txt form of the man
+    pages, and it removes trailing spaces from listed files. It also creates
+    pcre.h.generic and config.h.generic from pcre.h and config.h. In the latter
+    case, it wraps all the #defines with #ifndefs. This script should be run
     before "make dist".
-    
+
 12. Fixed two fairly obscure bugs concerned with quantified caseless matching
     with Unicode property support.
-    
-    (a) For a maximizing quantifier, if the two different cases of the 
-        character were of different lengths in their UTF-8 codings (there are 
-        some cases like this - I found 11), and the matching function had to 
+
+    (a) For a maximizing quantifier, if the two different cases of the
+        character were of different lengths in their UTF-8 codings (there are
+        some cases like this - I found 11), and the matching function had to
         back up over a mixture of the two cases, it incorrectly assumed they
         were both the same length.
-        
-    (b) When PCRE was configured to use the heap rather than the stack for 
-        recursion during matching, it was not correctly preserving the data for 
-        the other case of a UTF-8 character when checking ahead for a match 
-        while processing a minimizing repeat. If the check also involved 
+
+    (b) When PCRE was configured to use the heap rather than the stack for
+        recursion during matching, it was not correctly preserving the data for
+        the other case of a UTF-8 character when checking ahead for a match
+        while processing a minimizing repeat. If the check also involved
         matching a wide character, but failed, corruption could cause an
         erroneous result when trying to check for a repeat of the original
         character.
-        
+
 13. Some tidying changes to the testing mechanism:
 
     (a) The RunTest script now detects the internal link size and whether there
         is UTF-8 and UCP support by running ./pcretest -C instead of relying on
-        values substituted by "configure". (The RunGrepTest script already did 
-        this for UTF-8.) The configure.ac script no longer substitutes the 
-        relevant variables.   
-        
+        values substituted by "configure". (The RunGrepTest script already did
+        this for UTF-8.) The configure.ac script no longer substitutes the
+        relevant variables.
+
     (b) The debugging options /B and /D in pcretest show the compiled bytecode
         with length and offset values. This means that the output is different
         for different internal link sizes. Test 2 is skipped for link sizes
         other than 2 because of this, bypassing the problem. Unfortunately,
         there was also a test in test 3 (the locale tests) that used /B and
-        failed for link sizes other than 2. Rather than cut the whole test out, 
-        I have added a new /Z option to pcretest that replaces the length and 
-        offset values with spaces. This is now used to make test 3 independent 
+        failed for link sizes other than 2. Rather than cut the whole test out,
+        I have added a new /Z option to pcretest that replaces the length and
+        offset values with spaces. This is now used to make test 3 independent
         of link size. (Test 2 will be tidied up later.)
-        
-14. If erroroffset was passed as NULL to pcre_compile, it provoked a 
+
+14. If erroroffset was passed as NULL to pcre_compile, it provoked a
     segmentation fault instead of returning the appropriate error message.
-        
+
 
 Version 7.0 19-Dec-06
 ---------------------
diff --git a/Makefile.in b/Makefile.in
index 6b8887f..c22ab3f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -398,7 +398,7 @@ dist_noinst_DATA = $(pcrecpp_html)
 
 # The Libtool libraries to install.  We'll add to this later.
 lib_LTLIBRARIES = libpcre.la libpcreposix.la $(am__append_3)
-check_SCRIPTS = 
+check_SCRIPTS =
 noinst_SCRIPTS = RunTest RunGrepTest
 
 # Additional files to delete on 'make clean' and 'make maintainer-clean'.
@@ -583,7 +583,7 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in:  $(am__configure_deps)
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
 	touch $@
@@ -633,11 +633,11 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES) 
+libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES)
 	$(libpcre_la_LINK) -rpath $(libdir) $(libpcre_la_OBJECTS) $(libpcre_la_LIBADD) $(LIBS)
-libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES) 
+libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES)
 	$(libpcrecpp_la_LINK) $(am_libpcrecpp_la_rpath) $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_LIBADD) $(LIBS)
-libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES) 
+libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES)
 	$(libpcreposix_la_LINK) -rpath $(libdir) $(libpcreposix_la_OBJECTS) $(libpcreposix_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -674,25 +674,25 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-dftables$(EXEEXT): $(dftables_OBJECTS) $(dftables_DEPENDENCIES) 
+dftables$(EXEEXT): $(dftables_OBJECTS) $(dftables_DEPENDENCIES)
 	@rm -f dftables$(EXEEXT)
 	$(LINK) $(dftables_OBJECTS) $(dftables_LDADD) $(LIBS)
-pcre_scanner_unittest$(EXEEXT): $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_DEPENDENCIES) 
+pcre_scanner_unittest$(EXEEXT): $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_DEPENDENCIES)
 	@rm -f pcre_scanner_unittest$(EXEEXT)
 	$(CXXLINK) $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_LDADD) $(LIBS)
-pcre_stringpiece_unittest$(EXEEXT): $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_DEPENDENCIES) 
+pcre_stringpiece_unittest$(EXEEXT): $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_DEPENDENCIES)
 	@rm -f pcre_stringpiece_unittest$(EXEEXT)
 	$(CXXLINK) $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_LDADD) $(LIBS)
-pcrecpp_unittest$(EXEEXT): $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_DEPENDENCIES) 
+pcrecpp_unittest$(EXEEXT): $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_DEPENDENCIES)
 	@rm -f pcrecpp_unittest$(EXEEXT)
 	$(CXXLINK) $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_LDADD) $(LIBS)
-pcredemo$(EXEEXT): $(pcredemo_OBJECTS) $(pcredemo_DEPENDENCIES) 
+pcredemo$(EXEEXT): $(pcredemo_OBJECTS) $(pcredemo_DEPENDENCIES)
 	@rm -f pcredemo$(EXEEXT)
 	$(LINK) $(pcredemo_OBJECTS) $(pcredemo_LDADD) $(LIBS)
-pcregrep$(EXEEXT): $(pcregrep_OBJECTS) $(pcregrep_DEPENDENCIES) 
+pcregrep$(EXEEXT): $(pcregrep_OBJECTS) $(pcregrep_DEPENDENCIES)
 	@rm -f pcregrep$(EXEEXT)
 	$(LINK) $(pcregrep_OBJECTS) $(pcregrep_LDADD) $(LIBS)
-pcretest$(EXEEXT): $(pcretest_OBJECTS) $(pcretest_DEPENDENCIES) 
+pcretest$(EXEEXT): $(pcretest_OBJECTS) $(pcretest_DEPENDENCIES)
 	@rm -f pcretest$(EXEEXT)
 	$(LINK) $(pcretest_OBJECTS) $(pcretest_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
diff --git a/NEWS b/NEWS
index da936fe..f8e1b73 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Release 7.1 12-Mar-07
 
 There are no new features in this release. A few bugs are fixed (see ChangeLog
 for details), but the major change is a complete re-implementation of the build
-system. This now has full Autotools support and so is now "standard" in some 
+system. This now has full Autotools support and so is now "standard" in some
 sense. It should help with compiling PCRE in a wide variety of environments.
 
 
diff --git a/README b/README
index 91fa161..1977979 100644
--- a/README
+++ b/README
@@ -4,10 +4,10 @@ README file for PCRE (Perl-compatible regular expression library)
 The latest release of PCRE is always available from
 
   ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.gz
-  
+
 There is a mailing list for discussion about the development of PCRE at
-  
-  pcre-dev@exim.org 
+
+  pcre-dev@exim.org
 
 Please read the NEWS file if you are upgrading from a previous release.
 The contents of this README file are:
@@ -74,11 +74,11 @@ documentation is supplied in two other forms:
      those that summarize individual functions. The other two are the text
      forms of the section 1 man pages for the pcregrep and pcretest commands.
      These text forms are provided for ease of scanning with text editors or
-     similar tools. They are installed in <prefix>/share/doc/pcre, where 
+     similar tools. They are installed in <prefix>/share/doc/pcre, where
      <prefix> is the installation prefix (defaulting to /usr/local).
 
   2. A set of files containing all the documentation in HTML form, hyperlinked
-     in various ways, and rooted in a file called index.html, is distributed in 
+     in various ways, and rooted in a file called index.html, is distributed in
      doc/html and installed in <prefix>/share/doc/pcre/html.
 
 
@@ -234,7 +234,7 @@ The "configure" script builds the following files for the basic C library:
 . RunTest is a script for running tests on the basic C library
 . RunGrepTest is a script for running tests on the pcregrep command
 
-Versions of config.h and pcre.h are distributed in the PCRE tarballs under 
+Versions of config.h and pcre.h are distributed in the PCRE tarballs under
 the names config.h.generic and pcre.h.generic. These are provided for the
 benefit of those who have to built PCRE without the benefit of "configure". If
 you use "configure", the .generic versions are not used.
@@ -395,14 +395,14 @@ use the workaround of specifying the following environment variable prior to
 running the "configure" script:
 
   CXXLDFLAGS="-lstd_v2 -lCsup_v2"
-  
+
 
 Making new tarballs
 -------------------
 
-The command "make dist" creates three PCRE tarballs, in tar.gz, tar.bz2, and 
-zip formats. However, if you have modified any of the man page sources in the 
-doc directory, you should first run the PrepareRelease script. This re-creates 
+The command "make dist" creates three PCRE tarballs, in tar.gz, tar.bz2, and
+zip formats. However, if you have modified any of the man page sources in the
+doc directory, you should first run the PrepareRelease script. This re-creates
 the .txt and HTML forms of the documentation from the man pages.
 
 
diff --git a/configure b/configure
index de0624b..7c41847 100755
--- a/configure
+++ b/configure
@@ -19771,7 +19771,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 PCRE_MAJOR="7"
 PCRE_MINOR="1"
 PCRE_PRERELEASE="-RC1"
-PCRE_DATE="2007-03-05"
+PCRE_DATE="2007-03-12"
 
 
 
diff --git a/configure.ac b/configure.ac
index 606f882..ee16e2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl empty.
 m4_define(pcre_major, [7])
 m4_define(pcre_minor, [1])
 m4_define(pcre_prerelease, [-RC1])
-m4_define(pcre_date, [2007-03-05])
+m4_define(pcre_date, [2007-03-12])
 
 # Libtool shared library interface versions (current:revision:age)
 m4_define(libpcre_version, [0:1:0])
@@ -174,7 +174,7 @@ it to run on SunOS4 and other "close to standard" systems.
 
 If you are going to build PCRE "by hand" on a system without "configure" you
 should copy the distributed config.h.generic to config.h, and then set up the
-macros the way you need them. Alternatively, you can avoid editing by using -D 
+macros the way you need them. Alternatively, you can avoid editing by using -D
 on the compiler command line to set the macro values.
 
 PCRE uses memmove() if HAVE_MEMMOVE is set to 1; otherwise it uses bcopy() if
diff --git a/doc/html/pcrecpp.html b/doc/html/pcrecpp.html
index 7b07f49..30bc2d2 100644
--- a/doc/html/pcrecpp.html
+++ b/doc/html/pcrecpp.html
@@ -352,7 +352,7 @@ string is left unaffected.
 <P>
 The C++ wrapper was contributed by Google Inc.
 <br>
-Copyright &copy; 2006 Google Inc.
+Copyright &copy; 2007 Google Inc.
 <br>
 </P>
 <br><a name="SEC12" href="#TOC1">REVISION</a><br>
diff --git a/doc/html/pcrestack.html b/doc/html/pcrestack.html
index 525cc99..7236400 100644
--- a/doc/html/pcrestack.html
+++ b/doc/html/pcrestack.html
@@ -63,7 +63,7 @@ frame for each matched character. For a long string, a lot of stack is
 required. Consider now this rewritten pattern, which matches exactly the same
 strings:
 <pre>
-  ([^&#60;]++|&#60;(?!inet))
+  ([^&#60;]++|&#60;(?!inet))+
 </pre>
 This uses very much less stack, because runs of characters that do not contain
 "&#60;" are "swallowed" in one item inside the parentheses. Recursion happens only
@@ -139,7 +139,7 @@ Cambridge CB2 3QH, England.
 REVISION
 </b><br>
 <P>
-Last updated: 06 March 2007
+Last updated: 12 March 2007
 <br>
 Copyright &copy; 1997-2007 University of Cambridge.
 <br>
diff --git a/doc/html/pcretest.html b/doc/html/pcretest.html
index f46d139..818ba3c 100644
--- a/doc/html/pcretest.html
+++ b/doc/html/pcretest.html
@@ -249,7 +249,11 @@ multiple copies of the same substring.
 </P>
 <P>
 The <b>/B</b> modifier is a debugging feature. It requests that <b>pcretest</b>
-output a representation of the compiled byte code after compilation.
+output a representation of the compiled byte code after compilation. Normally
+this information contains length and offset values; however, if <b>/Z</b> is
+also present, this data is replaced by spaces. This is a special feature for
+use in the automatic test scripts; it ensures that the same output is generated
+for different internal link sizes.
 </P>
 <P>
 The <b>/L</b> modifier must be followed directly by the name of a locale, for
diff --git a/doc/pcre.txt b/doc/pcre.txt
index e733571..629b51c 100644
--- a/doc/pcre.txt
+++ b/doc/pcre.txt
@@ -5389,7 +5389,7 @@ REPLACING PARTS OF STRINGS
 AUTHOR
 
        The C++ wrapper was contributed by Google Inc.
-       Copyright (c) 2006 Google Inc.
+       Copyright (c) 2007 Google Inc.
 
 
 REVISION
@@ -5525,7 +5525,7 @@ PCRE DISCUSSION OF STACK USAGE
        ter. For a long string, a lot of stack is required. Consider  now  this
        rewritten pattern, which matches exactly the same strings:
 
-         ([^<]++|<(?!inet))
+         ([^<]++|<(?!inet))+
 
        This  uses very much less stack, because runs of characters that do not
        contain "<" are "swallowed" in one item inside the parentheses.  Recur-
@@ -5587,7 +5587,7 @@ AUTHOR
 
 REVISION
 
-       Last updated: 06 March 2007
+       Last updated: 12 March 2007
        Copyright (c) 1997-2007 University of Cambridge.
 ------------------------------------------------------------------------------
 
diff --git a/doc/pcretest.1 b/doc/pcretest.1
index 7cb127f..cbaa0d1 100644
--- a/doc/pcretest.1
+++ b/doc/pcretest.1
@@ -214,7 +214,7 @@ the subject string. This is useful for tests where the subject contains
 multiple copies of the same substring.
 .P
 The \fB/B\fP modifier is a debugging feature. It requests that \fBpcretest\fP
-output a representation of the compiled byte code after compilation. Normally 
+output a representation of the compiled byte code after compilation. Normally
 this information contains length and offset values; however, if \fB/Z\fP is
 also present, this data is replaced by spaces. This is a special feature for
 use in the automatic test scripts; it ensures that the same output is generated
diff --git a/doc/pcretest.txt b/doc/pcretest.txt
index 710afba..8c16c74 100644
--- a/doc/pcretest.txt
+++ b/doc/pcretest.txt
@@ -197,7 +197,11 @@ PATTERN MODIFIERS
        subject contains multiple copies of the same substring.
 
        The  /B modifier is a debugging feature. It requests that pcretest out-
-       put a representation of the compiled byte code after compilation.
+       put a representation of the compiled byte code after compilation.  Nor-
+       mally  this  information contains length and offset values; however, if
+       /Z is also present, this data is replaced by spaces. This is a  special
+       feature for use in the automatic test scripts; it ensures that the same
+       output is generated for different internal link sizes.
 
        The /L modifier must be followed directly by the name of a locale,  for
        example,
diff --git a/pcre_exec.c b/pcre_exec.c
index 7d059f0..b321456 100644
--- a/pcre_exec.c
+++ b/pcre_exec.c
@@ -299,8 +299,8 @@ typedef struct heapframe {
   int Xprop_category;
   int Xprop_chartype;
   int Xprop_script;
-  int Xoclength; 
-  uschar Xocchars[8]; 
+  int Xoclength;
+  uschar Xocchars[8];
 #endif
 
   int Xctype;
@@ -2062,7 +2062,7 @@ for (;;)
         for (i = 1; i <= min; i++)
           {
           if (memcmp(eptr, charptr, length) == 0) eptr += length;
-#ifdef SUPPORT_UCP          
+#ifdef SUPPORT_UCP
           /* Need braces because of following else */
           else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
           else
@@ -2072,7 +2072,7 @@ for (;;)
             }
 #else   /* without SUPPORT_UCP */
           else { RRETURN(MATCH_NOMATCH); }
-#endif  /* SUPPORT_UCP */                     
+#endif  /* SUPPORT_UCP */
           }
 
         if (min == max) continue;
@@ -2085,7 +2085,7 @@ for (;;)
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             if (memcmp(eptr, charptr, length) == 0) eptr += length;
-#ifdef SUPPORT_UCP            
+#ifdef SUPPORT_UCP
             /* Need braces because of following else */
             else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
             else
@@ -2107,7 +2107,7 @@ for (;;)
             {
             if (eptr > md->end_subject - length) break;
             if (memcmp(eptr, charptr, length) == 0) eptr += length;
-#ifdef SUPPORT_UCP             
+#ifdef SUPPORT_UCP
             else if (oclength == 0) break;
             else
               {
@@ -2116,7 +2116,7 @@ for (;;)
               }
 #else   /* without SUPPORT_UCP */
             else break;
-#endif  /* SUPPORT_UCP */                          
+#endif  /* SUPPORT_UCP */
             }
 
           if (possessive) continue;
@@ -2128,9 +2128,9 @@ for (;;)
 #ifdef SUPPORT_UCP
            eptr--;
            BACKCHAR(eptr);
-#else   /* without SUPPORT_UCP */            
+#else   /* without SUPPORT_UCP */
            eptr -= length;
-#endif  /* SUPPORT_UCP */            
+#endif  /* SUPPORT_UCP */
            }
           }
         /* Control never gets here */
diff --git a/pcre_internal.h b/pcre_internal.h
index 9caec72..fa7cff8 100644
--- a/pcre_internal.h
+++ b/pcre_internal.h
@@ -223,8 +223,8 @@ if (dest > src)
 else
   {
   for (i = 0; i < n; ++i) *dest++ = *src++;
-  return (void *)(dest - n); 
-  }    
+  return (void *)(dest - n);
+  }
 }
 #define memmove(a, b, c) pcre_memmove(a, b, c)
 #endif   /* not HAVE_BCOPY */
diff --git a/pcre_printint.src b/pcre_printint.src
index fba5052..79299f7 100644
--- a/pcre_printint.src
+++ b/pcre_printint.src
@@ -142,7 +142,7 @@ return (ptype == pvalue)? "??" : "??";
 
 /* Make this function work for a regex with integers either byte order.
 However, we assume that what we are passed is a compiled regex. The
-print_lengths flag controls whether offsets and lengths of items are printed. 
+print_lengths flag controls whether offsets and lengths of items are printed.
 They can be turned off from pcretest so that automatic tests on bytecode can be
 written that do not depend on the value of LINK_SIZE. */
 
@@ -181,7 +181,7 @@ for(;;)
   if (print_lengths)
     fprintf(f, "%3d ", (int)(code - codestart));
   else
-    fprintf(f, "    ");    
+    fprintf(f, "    ");
 
   switch(*code)
     {
@@ -219,7 +219,7 @@ for(;;)
     case OP_CBRA:
     case OP_SCBRA:
     if (print_lengths) fprintf(f, "%3d ", GET(code, 1));
-      else fprintf(f, "    ");     
+      else fprintf(f, "    ");
     fprintf(f, "%s %d", OP_names[*code], GET2(code, 1+LINK_SIZE));
     break;
 
@@ -238,7 +238,7 @@ for(;;)
     case OP_SCOND:
     case OP_REVERSE:
     if (print_lengths) fprintf(f, "%3d ", GET(code, 1));
-      else fprintf(f, "    ");     
+      else fprintf(f, "    ");
     fprintf(f, "%s", OP_names[*code]);
     break;
 
@@ -356,7 +356,7 @@ for(;;)
 
     case OP_RECURSE:
     if (print_lengths) fprintf(f, "%3d ", GET(code, 1));
-      else fprintf(f, "    ");     
+      else fprintf(f, "    ");
     fprintf(f, "%s", OP_names[*code]);
     break;
 
diff --git a/pcregrep.c b/pcregrep.c
index 080e970..8c768e1 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -1866,7 +1866,7 @@ hints_list = (pcre_extra **)malloc(MAX_PATTERN_COUNT * sizeof(pcre_extra *));
 if (pattern_list == NULL || hints_list == NULL)
   {
   fprintf(stderr, "pcregrep: malloc failed\n");
-  goto EXIT2;  
+  goto EXIT2;
   }
 
 /* If no patterns were provided by -e, and there is no file provided by -f,
@@ -1885,7 +1885,7 @@ for (j = 0; j < cmd_pattern_count; j++)
   {
   if (!compile_pattern(patterns[j], pcre_options, NULL,
        (j == 0 && cmd_pattern_count == 1)? 0 : j + 1))
-    goto EXIT2;      
+    goto EXIT2;
   }
 
 /* Compile the regular expressions that are provided in a file. */
@@ -1909,7 +1909,7 @@ if (pattern_filename != NULL)
       {
       fprintf(stderr, "pcregrep: Failed to open %s: %s\n", pattern_filename,
         strerror(errno));
-      goto EXIT2;   
+      goto EXIT2;
       }
     filename = pattern_filename;
     }
@@ -1974,7 +1974,7 @@ if (i >= argc)
   {
   rc = pcregrep(stdin, (filenames > FN_DEFAULT)? stdin_name : NULL);
   goto EXIT;
-  }  
+  }
 
 /* Otherwise, work through the remaining arguments as files or directories.
 Pass in the fact that there is only one argument at top level - this suppresses
@@ -1994,14 +1994,14 @@ for (; i < argc; i++)
 EXIT:
 if (pattern_list != NULL)
   {
-  for (i = 0; i < pattern_count; i++) free(pattern_list[i]); 
+  for (i = 0; i < pattern_count; i++) free(pattern_list[i]);
   free(pattern_list);
-  } 
+  }
 if (hints_list != NULL)
   {
-  for (i = 0; i < pattern_count; i++) free(hints_list[i]); 
+  for (i = 0; i < pattern_count; i++) free(hints_list[i]);
   free(hints_list);
-  } 
+  }
 return rc;
 
 EXIT2:
diff --git a/pcretest.c b/pcretest.c
index a8e202b..313afcd 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -944,7 +944,7 @@ while (!done)
   size_t size, regex_gotten_store;
   int do_study = 0;
   int do_debug = debug;
-  int debug_lengths = 1; 
+  int debug_lengths = 1;
   int do_G = 0;
   int do_g = 0;
   int do_showinfo = showinfo;
@@ -1135,7 +1135,7 @@ while (!done)
       case 'S': do_study = 1; break;
       case 'U': options |= PCRE_UNGREEDY; break;
       case 'X': options |= PCRE_EXTRA; break;
-      case 'Z': debug_lengths = 0; 
+      case 'Z': debug_lengths = 0;
       case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
       case '?': options |= PCRE_NO_UTF8_CHECK; break;