Browse Source

libarchive: 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.
Brad King 14 years ago
parent
commit
680fc0eda8
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Utilities/cmlibarchive/libarchive/archive_string.c

+ 1 - 1
Utilities/cmlibarchive/libarchive/archive_string.c

@@ -2287,7 +2287,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;
 
@@ -2311,6 +2310,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. */
 }