zlib functions take a gzFile not gzFile * (gzFile is already a pointer).

From Josh Rickmar.

diff --git a/usr.bin/grep/binary.c b/usr.bin/grep/binary.c
index 1a22a6b..119c946 100644 (file)
--- a/usr.bin/grep/binary.c
+++ b/usr.bin/grep/binary.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: binary.c,v 1.18 2013/11/12 22:50:42 deraadt Exp $     */
+/*     $OpenBSD: binary.c,v 1.19 2021/03/10 21:55:22 millert Exp $     */
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
@@ -62,7 +62,7 @@ bin_file(FILE *f)
 
 #ifndef NOZ
 int
-gzbin_file(gzFile *f)
+gzbin_file(gzFile f)
 {
        char            buf[BUFSIZ];
        int             m;

diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index 0cfeaa8..27b7f76 100644 (file)
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: file.c,v 1.15 2019/01/31 01:30:46 tedu Exp $  */
+/*     $OpenBSD: file.c,v 1.16 2021/03/10 21:55:22 millert Exp $       */
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
@@ -49,12 +49,12 @@ struct file {
        int      noseek;
        FILE    *f;
        mmf_t   *mmf;
-       gzFile  *gzf;
+       gzFile   gzf;
 };
 
 #ifndef NOZ
 static char *
-gzfgetln(gzFile *f, size_t *len)
+gzfgetln(gzFile f, size_t *len)
 {
        size_t          n;
        int             c;

diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index b3d24ae..731bbcc 100644 (file)
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: grep.h,v 1.27 2019/10/07 17:47:32 tedu Exp $  */
+/*     $OpenBSD: grep.h,v 1.28 2021/03/10 21:55:22 millert Exp $       */
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
@@ -124,6 +124,6 @@ void                 grep_close(file_t *f);
 
 /* binary.c */
 int             bin_file(FILE * f);
-int             gzbin_file(gzFile * f);
+int             gzbin_file(gzFile f);
 int             mmbin_file(mmf_t *f);