From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 18 May 2011 10:42:29 +0000 (-0400)
Subject: Fix build failure on Visual Studio.
X-Git-Tag: v3.0.0a~323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf00902a24cd310b3c39059f76982b96487d779d;p=thirdparty%2Flibarchive.git

Fix build failure on Visual Studio.

SVN-Revision: 3364
---

diff --git a/libarchive/test/test_open_failure.c b/libarchive/test/test_open_failure.c
index b825e1d62..06a3a2c1f 100644
--- a/libarchive/test/test_open_failure.c
+++ b/libarchive/test/test_open_failure.c
@@ -41,9 +41,9 @@ struct my_data {
 static ssize_t
 my_read(struct archive *a, void *_private, const void **buff)
 {
+	struct my_data *private = (struct my_data *)_private;
 	(void)a; /* UNUSED */
 	(void)buff; /* UNUSED */
-	struct my_data *private = (struct my_data *)_private;
 	assertEqualInt(MAGIC, private->magic);
 	++private->read_called;
 	return (private->read_return);
@@ -52,10 +52,10 @@ my_read(struct archive *a, void *_private, const void **buff)
 static ssize_t
 my_write(struct archive *a, void *_private, const void *buff, size_t s)
 {
+	struct my_data *private = (struct my_data *)_private;
 	(void)a; /* UNUSED */
 	(void)buff; /* UNUSED */
 	(void)s; /* UNUSED */
-	struct my_data *private = (struct my_data *)_private;
 	assertEqualInt(MAGIC, private->magic);
 	++private->write_called;
 	return (private->write_return);
@@ -64,8 +64,8 @@ my_write(struct archive *a, void *_private, const void *buff, size_t s)
 static int
 my_open(struct archive *a, void *_private)
 {
-	(void)a; /* UNUSED */
 	struct my_data *private = (struct my_data *)_private;
+	(void)a; /* UNUSED */
 	assertEqualInt(MAGIC, private->magic);
 	++private->open_called;
 	return (private->open_return);
@@ -74,8 +74,8 @@ my_open(struct archive *a, void *_private)
 static int
 my_close(struct archive *a, void *_private)
 {
-	(void)a; /* UNUSED */
 	struct my_data *private = (struct my_data *)_private;
+	(void)a; /* UNUSED */
 	assertEqualInt(MAGIC, private->magic);
 	++private->close_called;
 	return (private->close_return);