From: Sebastian Pop Date: Fri, 7 Dec 2018 18:39:59 +0000 (-0600) Subject: remove build warning about 'fdopen' X-Git-Tag: 1.9.9-b1~597 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59476a9cb490bb168fc9555c247739ded3fbcb01;p=thirdparty%2Fzlib-ng.git remove build warning about 'fdopen' zlib-ng/test/fuzz/minigzip_fuzzer.c:153:31: warning: implicit declaration of function 'fdopen' is invalid in C99 [-Wimplicit-function-declaration] gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") : ^ zlib-ng/test/fuzz/minigzip_fuzzer.c:153:29: warning: pointer/integer type mismatch in conditional expression ('int' and 'FILE *' (aka 'struct _IO_FILE *')) [-Wconditional-type-mismatch] gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") : ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- diff --git a/test/fuzz/minigzip_fuzzer.c b/test/fuzz/minigzip_fuzzer.c index 375bab588..73d25bb47 100644 --- a/test/fuzz/minigzip_fuzzer.c +++ b/test/fuzz/minigzip_fuzzer.c @@ -150,8 +150,15 @@ gzFile gz_open(const char *path, int fd, const char *mode) free(gz); return NULL; } - gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") : - fopen(path, gz->write ? "wb" : "rb"); +#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE + gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") + : fopen(path, gz->write ? "wb" : "rb"); +#else + /* fdopen is not available in C99. */ + if (path == NULL) + exit(1); + gz->file = fopen(path, gz->write ? "wb" : "rb"); +#endif if (gz->file == NULL) { gz->write ? PREFIX(deflateEnd)(&(gz->strm)) : PREFIX(inflateEnd)(&(gz->strm)); free(gz);