diff options
| author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-05-25 12:52:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 12:52:53 +0200 |
| commit | 1fc4168b81f565feab409b92ccb61c57a1c550eb (patch) | |
| tree | f5b54c9699aabb120f4cfa3240164fc17fd1d075 /src/Common/libzip/zip_source_function.c | |
| parent | b872702309b20f2467d58652c3b00493ac4058bd (diff) | |
| download | VeraCrypt-1fc4168b81f565feab409b92ccb61c57a1c550eb.tar.gz VeraCrypt-1fc4168b81f565feab409b92ccb61c57a1c550eb.zip | |
Update Libzip to latest 1.9.2 (#1071)
* Libzip 1.9.2
Updated Libzip to latest version 1.9.2 and changed version number in the config.h from 1.7.3 to 1.9.2. Not sure if anything else needs to be tweaked :)
* Modified Libzip to work with Visual studio
* Update README.md
Update libzip copyright.
* Added the missing files.
I've added the missing files zipconf.h and config.h, I've missed those sorry for that!
Diffstat (limited to 'src/Common/libzip/zip_source_function.c')
| -rw-r--r-- | src/Common/libzip/zip_source_function.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Common/libzip/zip_source_function.c b/src/Common/libzip/zip_source_function.c index d5c1b5b0..e4eac9df 100644 --- a/src/Common/libzip/zip_source_function.c +++ b/src/Common/libzip/zip_source_function.c @@ -1,9 +1,9 @@ /* zip_source_function.c -- create zip data source from callback function - Copyright (C) 1999-2019 Dieter Baron and Thomas Klausner + Copyright (C) 1999-2022 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 @@ -40,7 +40,7 @@ ZIP_EXTERN zip_source_t * zip_source_function(zip_t *za, zip_source_callback zcb, void *ud) { if (za == NULL) { - return NULL; + return NULL; } return zip_source_function_create(zcb, ud, &za->error); @@ -52,14 +52,14 @@ zip_source_function_create(zip_source_callback zcb, void *ud, zip_error_t *error zip_source_t *zs; if ((zs = _zip_source_new(error)) == NULL) - return NULL; + return NULL; zs->cb.f = zcb; zs->ud = ud; - zs->supports = zcb(ud, NULL, 0, ZIP_SOURCE_SUPPORTS); + zs->supports = zcb(ud, NULL, 0, ZIP_SOURCE_SUPPORTS) | zip_source_make_command_bitmap(ZIP_SOURCE_SUPPORTS, -1); if (zs->supports < 0) { - zs->supports = ZIP_SOURCE_SUPPORTS_READABLE; + zs->supports = ZIP_SOURCE_SUPPORTS_READABLE; } return zs; @@ -77,8 +77,8 @@ _zip_source_new(zip_error_t *error) { zip_source_t *src; if ((src = (zip_source_t *)malloc(sizeof(*src))) == NULL) { - zip_error_set(error, ZIP_ER_MEMORY, 0); - return NULL; + zip_error_set(error, ZIP_ER_MEMORY, 0); + return NULL; } src->src = NULL; @@ -92,6 +92,7 @@ _zip_source_new(zip_error_t *error) { zip_error_init(&src->error); src->eof = false; src->had_read_error = false; + src->bytes_read = 0; return src; } |