From: Martin Matuska <martin@matuska.org>
Date: Thu, 13 Feb 2020 00:20:18 +0000 (+0100)
Subject: Solve warning by excluding more code to _WIN32 in file_open()
X-Git-Tag: v3.4.3~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86f17852fa801216be5e1113787d81ba5c070a33;p=thirdparty%2Flibarchive.git

Solve warning by excluding more code to _WIN32 in file_open()
---

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;