diff options
| author | Brad King <brad.king@kitware.com> | 2011-12-22 21:34:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-12-23 21:04:59 (GMT) |
| commit | 680fc0eda85d660057999c9a7e7cfa2d5eeeae0a (patch) | |
| tree | b9f94656330dcd23a850ac4716e7d27cbe17eec2 /Utilities | |
| parent | e1afd072bce9f58db28e6d64118cf806b207f0fe (diff) | |
| download | CMake-680fc0eda85d660057999c9a7e7cfa2d5eeeae0a.zip CMake-680fc0eda85d660057999c9a7e7cfa2d5eeeae0a.tar.gz CMake-680fc0eda85d660057999c9a7e7cfa2d5eeeae0a.tar.bz2 | |
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.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_string.c b/Utilities/cmlibarchive/libarchive/archive_string.c index 5e95dd7..5bd09bd 100644 --- a/Utilities/cmlibarchive/libarchive/archive_string.c +++ b/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. */ } |