summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2014-04-03 16:51:41 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2014-04-03 16:51:41 +0000
commit0a69641adb1b6598f017f467a3d60e5b7459bb02 (patch)
treec94104a2b99a3e7d087aa4821bcc4ebe57765347
parent1c276281e7217bf44effdee58ab19a7d895df2e0 (diff)
downloadpcre-0a69641adb1b6598f017f467a3d60e5b7459bb02.tar.gz
Two minor changes to avoid compiler warnings.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1467 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--pcre_byte_order.c6
-rw-r--r--pcregrep.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/pcre_byte_order.c b/pcre_byte_order.c
index 01cbca3..cf5f12b 100644
--- a/pcre_byte_order.c
+++ b/pcre_byte_order.c
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2013 University of Cambridge
+ Copyright (c) 1997-2014 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -311,9 +311,9 @@ while(TRUE)
ptr++;
}
/* Control should never reach here in 16/32 bit mode. */
-#endif /* !COMPILE_PCRE8 */
-
+#else /* In 8-bit mode, the pattern does not need to be processed. */
return 0;
+#endif /* !COMPILE_PCRE8 */
}
/* End of pcre_byte_order.c */
diff --git a/pcregrep.c b/pcregrep.c
index f6b6ec3..3e8d05d 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -12,7 +12,7 @@ distribution because other apparatus is needed to compile pcregrep for z/OS.
The header can be found in the special z/OS distribution, which is available
from www.zaconsultants.net or from www.cbttape.org.
- Copyright (c) 1997-2013 University of Cambridge
+ Copyright (c) 1997-2014 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -1298,7 +1298,7 @@ switch(endlinetype)
while (p > startptr && p[-1] != '\n') p--;
if (p <= startptr + 1 || p[-2] == '\r') return p;
}
- return p; /* But control should never get here */
+ /* Control can never get here */
case EL_ANY:
case EL_ANYCRLF: