From: Brad King <brad.king@kitware.com>
Date: Wed, 11 Jan 2012 13:15:31 +0000 (-0500)
Subject: Fix var decl after statement in archive_string.c
X-Git-Tag: v3.0.4~2^2~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339bb070947d7bbb50acbbb4f4f56355a06afb51;p=thirdparty%2Flibarchive.git

Fix var decl after statement in archive_string.c

When HAVE_MBRTOWC is true we declare an extra local variable.  Move the
unused argument cast to the end of the invalid_mbs function.

SVN-Revision: 4130
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 550d7e7e6..906f12cdc 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -2291,7 +2291,6 @@ invalid_mbs(const void *_p, size_t n, struct archive_string_conv *sc)
 	const char *p = (const char *)_p;
 	size_t r;
 
-	(void)sc; /* UNUSED */
 #if HAVE_MBRTOWC
 	mbstate_t shift_state;
 
@@ -2315,6 +2314,7 @@ invalid_mbs(const void *_p, size_t n, struct archive_string_conv *sc)
 		p += r;
 		n -= r;
 	}
+	(void)sc; /* UNUSED */
 	return (0); /* All Okey. */
 }