summaryrefslogtreecommitdiff
path: root/pcre/pcregrep.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-06-05 13:44:44 +0200
committerSergei Golubchik <sergii@pisem.net>2014-06-05 13:44:44 +0200
commit8cc5973f1a18654e2e09076adeece2897a768411 (patch)
treed568879459533437f1f817a57e2ae30b737e6e53 /pcre/pcregrep.c
parent8958f8b8231374f220ac516779bd879cce4f99d4 (diff)
downloadmariadb-git-8cc5973f1a18654e2e09076adeece2897a768411.tar.gz
pcre-8.35.tar.bz2
Diffstat (limited to 'pcre/pcregrep.c')
-rw-r--r--pcre/pcregrep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pcre/pcregrep.c b/pcre/pcregrep.c
index f6b6ec39608..3e8d05dc8ad 100644
--- a/pcre/pcregrep.c
+++ b/pcre/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: