diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-02-22 13:42:20 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-22 15:03:45 +0000 |
| commit | 23209b2a3af04ca95f009b357402970fb1b0ce5c (patch) | |
| tree | 0dd43e1f2277d02423bd74322828ff74b2169332 /src/3rdparty/libarchive/libarchive/archive_string.c | |
| parent | 95f250e8437444cd1a2c16dd9c7209229109ea9d (diff) | |
| download | qtapplicationmanager-23209b2a3af04ca95f009b357402970fb1b0ce5c.tar.gz | |
Update libarchive 3rd-party code from 3.6.1 to 3.6.2
Change-Id: I4b40a2f820e52bdfa8c4165b7a10b25d7e941e17
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 6f0eed2f383fdac97e33e01f67fba90260426353)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty/libarchive/libarchive/archive_string.c')
| -rw-r--r-- | src/3rdparty/libarchive/libarchive/archive_string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libarchive/libarchive/archive_string.c b/src/3rdparty/libarchive/libarchive/archive_string.c index d7f2c46b..69458e1a 100644 --- a/src/3rdparty/libarchive/libarchive/archive_string.c +++ b/src/3rdparty/libarchive/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. |