summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-07-08 14:18:28 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-07-08 14:18:28 +0000
commitd7aea824315eb7c1c8b92643f06aed4f18586d49 (patch)
treeb614313b0be35251a82010b75083853d31eeea42
parente318175fddf1ad8b0b4979a74d59c7a719c18200 (diff)
downloadpcre-d7aea824315eb7c1c8b92643f06aed4f18586d49.tar.gz
Added two (int) casts to pcregrep.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@357 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog3
-rw-r--r--pcregrep.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8497437..6135e56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@ Version 8.0 02 Jul-08
6. Minor bugfix in pcrecpp.cc (change "" == ... to NULL == ...).
+7. Added two (int) casts to pcregrep when printing the difference of two
+ pointers, in case they are 64-bit values.
+
Version 7.7 07-May-08
---------------------
diff --git a/pcregrep.c b/pcregrep.c
index 87cbd4b..84d51f0 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -1054,10 +1054,10 @@ while (ptr < endptr)
if (printname != NULL) fprintf(stdout, "%s:", printname);
if (number) fprintf(stdout, "%d:", linenumber);
if (line_offsets)
- fprintf(stdout, "%d,%d", matchptr + offsets[0] - ptr,
+ fprintf(stdout, "%d,%d", (int)(matchptr + offsets[0] - ptr),
offsets[1] - offsets[0]);
else if (file_offsets)
- fprintf(stdout, "%d,%d", filepos + matchptr + offsets[0] - ptr,
+ fprintf(stdout, "%d,%d", (int)(filepos + matchptr + offsets[0] - ptr),
offsets[1] - offsets[0]);
else
fwrite(matchptr + offsets[0], 1, offsets[1] - offsets[0], stdout);