diff options
| author | Brad King <brad.king@kitware.com> | 2023-04-25 14:28:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-25 14:28:08 (GMT) |
| commit | 1e2bce305fca2f3d480c2e6b5257fa29921b148f (patch) | |
| tree | eabb87fa9425d01aba8d5e7386899cbde5bb9d2c /Utilities/cmlibarchive/libarchive/archive_string.c | |
| parent | 744a42c0ee0a1911b17a105915023eff1f1b7ce0 (diff) | |
| parent | e468170731ebdcfe1513cf3a14a07dc68f27320c (diff) | |
| download | CMake-1e2bce305fca2f3d480c2e6b5257fa29921b148f.zip CMake-1e2bce305fca2f3d480c2e6b5257fa29921b148f.tar.gz CMake-1e2bce305fca2f3d480c2e6b5257fa29921b148f.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2022-12-09 (ba80276c)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_string.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_string.c b/Utilities/cmlibarchive/libarchive/archive_string.c index d7f2c46..69458e1 100644 --- a/Utilities/cmlibarchive/libarchive/archive_string.c +++ b/Utilities/cmlibarchive/libarchive/archive_string.c @@ -3988,10 +3988,10 @@ int archive_mstring_get_mbs_l(struct archive *a, struct archive_mstring *aes, const char **p, size_t *length, struct archive_string_conv *sc) { - int r, ret = 0; - - (void)r; /* UNUSED */ + int ret = 0; #if defined(_WIN32) && !defined(__CYGWIN__) + int r; + /* * Internationalization programming on Windows must use Wide * characters because Windows platform cannot make locale UTF-8. |