VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/libzip/zip_new.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/libzip/zip_new.c')
-rw-r--r--src/Common/libzip/zip_new.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/Common/libzip/zip_new.c b/src/Common/libzip/zip_new.c
index c05c2a3c..4f69c8a2 100644
--- a/src/Common/libzip/zip_new.c
+++ b/src/Common/libzip/zip_new.c
@@ -1,9 +1,9 @@
/*
zip_new.c -- create and init struct zip
- 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
@@ -42,19 +42,18 @@
the new struct. */
zip_t *
-_zip_new(zip_error_t *error)
-{
+_zip_new(zip_error_t *error) {
zip_t *za;
za = (zip_t *)malloc(sizeof(struct zip));
if (!za) {
- zip_error_set(error, ZIP_ER_MEMORY, 0);
- return NULL;
+ zip_error_set(error, ZIP_ER_MEMORY, 0);
+ return NULL;
}
- if ((za->names = _zip_hash_new(ZIP_HASH_TABLE_SIZE, error)) == NULL) {
- free(za);
- return NULL;
+ if ((za->names = _zip_hash_new(error)) == NULL) {
+ free(za);
+ return NULL;
}
za->src = NULL;
@@ -68,7 +67,7 @@ _zip_new(zip_error_t *error)
za->entry = NULL;
za->nopen_source = za->nopen_source_alloc = 0;
za->open_source = NULL;
- za->progress_callback = NULL;
-
+ za->progress = NULL;
+
return za;
}