Module Name: src
Committed By: martin
Date: Thu Sep 12 20:04:58 UTC 2024
Modified Files:
src/usr.bin/grep [netbsd-10]: file.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #850):
usr.bin/grep/file.c: revision 1.12
usr.bin/grep/file.c: revision 1.13
grep: grep_refill: Fix -Wunused-variable for WITHOUT_GZIP
NFC otherwise.
grep: grep_refill: Fix previous; WITHOUT_BZ2 not WITHOUT_GZIP
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.10.1 src/usr.bin/grep/file.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/grep/file.c
diff -u src/usr.bin/grep/file.c:1.11 src/usr.bin/grep/file.c:1.11.10.1
--- src/usr.bin/grep/file.c:1.11 Fri Apr 5 13:34:41 2019
+++ src/usr.bin/grep/file.c Thu Sep 12 20:04:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.11 2019/04/05 13:34:41 christos Exp $ */
+/* $NetBSD: file.c,v 1.11.10.1 2024/09/12 20:04:58 martin Exp $ */
/* $FreeBSD: head/usr.bin/grep/file.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $ */
@@ -35,7 +35,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: file.c,v 1.11 2019/04/05 13:34:41 christos Exp $");
+__RCSID("$NetBSD: file.c,v 1.11.10.1 2024/09/12 20:04:58 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -74,7 +74,9 @@ static inline int
grep_refill(struct file *f)
{
ssize_t nr = -1;
+#ifndef WITHOUT_BZ2
int bzerr;
+#endif
bufpos = buffer;
bufrem = 0;
