diff options
| author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-07-17 14:11:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 14:11:12 +0200 |
| commit | 65765798d85258c0358b28b90aac68ed1851f49b (patch) | |
| tree | 22f573edc4e16790d9be208fce95db1134fe2ba4 /src/Common/libzip/zip_error_to_str.c | |
| parent | 6267b91931af87db2b95172389a6fbaac206e42e (diff) | |
| download | VeraCrypt-65765798d85258c0358b28b90aac68ed1851f49b.tar.gz VeraCrypt-65765798d85258c0358b28b90aac68ed1851f49b.zip | |
Libzip (#1152)
* Update LZMA to latest
* Update Libzip
Libzip updated to latest.
Diffstat (limited to 'src/Common/libzip/zip_error_to_str.c')
| -rw-r--r-- | src/Common/libzip/zip_error_to_str.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/Common/libzip/zip_error_to_str.c b/src/Common/libzip/zip_error_to_str.c index acd91c93..b60b7881 100644 --- a/src/Common/libzip/zip_error_to_str.c +++ b/src/Common/libzip/zip_error_to_str.c @@ -34,7 +34,6 @@ #include <stdio.h> #include <string.h> -#include <zlib.h> #define _ZIP_COMPILING_DEPRECATED #include "zipint.h" @@ -42,26 +41,18 @@ ZIP_EXTERN int zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se) { - const char *zs, *ss; + zip_error_t error; + const char *error_string; + int ret; - if (ze < 0 || ze >= _zip_err_str_count) { - return snprintf(buf, len, "Unknown error %d", ze); - } + zip_error_init(&error); + zip_error_set(&error, ze, se); - zs = _zip_err_str[ze].description; + error_string = zip_error_strerror(&error); - switch (_zip_err_str[ze].type) { - case ZIP_ET_SYS: - ss = strerror(se); - break; - - case ZIP_ET_ZLIB: - ss = zError(se); - break; - - default: - ss = NULL; - } + ret = snprintf_s(buf, ZIP_MIN(len, SIZE_MAX), error_string, strlen(error_string)); - return snprintf(buf, len, "%s%s%s", zs, (ss ? ": " : ""), (ss ? ss : "")); + zip_error_fini(&error); + + return ret; } |