From 86f17852fa801216be5e1113787d81ba5c070a33 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Thu, 13 Feb 2020 01:20:18 +0100 Subject: [PATCH] Solve warning by excluding more code to _WIN32 in file_open() --- libarchive/archive_read_open_filename.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libarchive/archive_read_open_filename.c b/libarchive/archive_read_open_filename.c index 86635e219..561289b69 100644 --- a/libarchive/archive_read_open_filename.c +++ b/libarchive/archive_read_open_filename.c @@ -221,7 +221,9 @@ file_open(struct archive *a, void *client_data) struct read_file_data *mine = (struct read_file_data *)client_data; void *buffer; const char *filename = NULL; +#if defined(_WIN32) && !defined(__CYGWIN__) const wchar_t *wfilename = NULL; +#endif int fd = -1; int is_disk_like = 0; #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) @@ -281,10 +283,12 @@ file_open(struct archive *a, void *client_data) #endif } if (fstat(fd, &st) != 0) { +#if defined(_WIN32) && !defined(__CYGWIN__) if (mine->filename_type == FNT_WCS) archive_set_error(a, errno, "Can't stat '%S'", wfilename); else +#endif archive_set_error(a, errno, "Can't stat '%s'", filename); goto fail; -- 2.47.2