summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2014-11-05 01:47:25 +0000
committerdteske <dteske@FreeBSD.org>2014-11-05 01:47:25 +0000
commit2d9d595ebbf233e053ea9ba966b239da7a17c928 (patch)
tree19cc2f386041319a29d202cfeef6e427267ade68 /usr.bin
parent6f8dd8b9669fc111b226f53bce85b556d0e045f0 (diff)
downloadFreeBSD-src-2d9d595ebbf233e053ea9ba966b239da7a17c928.zip
FreeBSD-src-2d9d595ebbf233e053ea9ba966b239da7a17c928.tar.gz
Fix build-error (pointy hat; didn't merge full up-to-date code)
MFC after: 21 days X-MFC-to: stable/10 stable/9 X-MFC-with: 274116
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/dpv/dpv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/dpv/dpv.c b/usr.bin/dpv/dpv.c
index 6e48b64..4e006f6 100644
--- a/usr.bin/dpv/dpv.c
+++ b/usr.bin/dpv/dpv.c
@@ -177,7 +177,7 @@ operate_on_bytes(struct dpv_file_node *file, int out)
fsync(out);
}
- overall_read += r;
+ dpv_overall_read += r;
file->read += r;
/* Calculate percentage of completion (if possible) */
@@ -226,7 +226,7 @@ operate_on_lines(struct dpv_file_node *file, int out)
/* Process the buffer for number of lines */
for (p = buf; p != NULL && *p != '\0';)
if ((p = strchr(p, '\n')) != NULL)
- overall_read++, p++, file->read++;
+ dpv_overall_read++, p++, file->read++;
/* Calculate percentage of completion (if possible) */
if (file->length >= 0) {
OpenPOWER on IntegriCloud