VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/libzip/zip_error_to_str.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/libzip/zip_error_to_str.c')
-rw-r--r--src/Common/libzip/zip_error_to_str.c40
1 files changed, 15 insertions, 25 deletions
diff --git a/src/Common/libzip/zip_error_to_str.c b/src/Common/libzip/zip_error_to_str.c
index 019feff8..b60b7881 100644
--- a/src/Common/libzip/zip_error_to_str.c
+++ b/src/Common/libzip/zip_error_to_str.c
@@ -1,9 +1,9 @@
/*
zip_error_to_str.c -- get string representation of zip error code
- Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+ Copyright (C) 1999-2021 Dieter Baron and Thomas Klausner
This file is part of libzip, a library to manipulate ZIP archives.
- The authors can be contacted at <libzip@nih.at>
+ The authors can be contacted at <info@libzip.org>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -17,7 +17,7 @@
3. The names of the authors may not be used to endorse or promote
products derived from this software without specific prior
written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,7 +33,6 @@
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#define _ZIP_COMPILING_DEPRECATED
@@ -41,28 +40,19 @@
ZIP_EXTERN int
-zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se)
-{
- const char *zs, *ss;
+zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se) {
+ zip_error_t error;
+ const char *error_string;
+ int ret;
+
+ zip_error_init(&error);
+ zip_error_set(&error, ze, se);
+
+ error_string = zip_error_strerror(&error);
- if (ze < 0 || ze >= _zip_nerr_str)
- return snprintf(buf, len, "Unknown error %d", ze);
+ ret = snprintf_s(buf, ZIP_MIN(len, SIZE_MAX), error_string, strlen(error_string));
- zs = _zip_err_str[ze];
-
- switch (_zip_err_type[ze]) {
- case ZIP_ET_SYS:
- ss = strerror(se);
- break;
-
- case ZIP_ET_ZLIB:
- ss = zError(se);
- break;
-
- default:
- ss = NULL;
- }
+ zip_error_fini(&error);
- return snprintf(buf, len, "%s%s%s",
- zs, (ss ? ": " : ""), (ss ? ss : ""));
+ return ret;
}