diff options
Diffstat (limited to 'src/Common/libzip/zip_source_call.c')
| -rw-r--r-- | src/Common/libzip/zip_source_call.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/Common/libzip/zip_source_call.c b/src/Common/libzip/zip_source_call.c index 21f28bc4..8c98fc2e 100644 --- a/src/Common/libzip/zip_source_call.c +++ b/src/Common/libzip/zip_source_call.c @@ -1,11 +1,11 @@ /* zip_source_call.c -- invoke callback command on zip_source - Copyright (C) 2009-2014 Dieter Baron and Thomas Klausner - + Copyright (C) 2009-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 are met: 1. Redistributions of source code must retain the above copyright @@ -16,9 +16,9 @@ distribution. 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 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY @@ -35,12 +35,11 @@ #include "zipint.h" zip_int64_t -_zip_source_call(zip_source_t *src, void *data, zip_uint64_t length, zip_source_cmd_t command) -{ +_zip_source_call(zip_source_t *src, void *data, zip_uint64_t length, zip_source_cmd_t command) { zip_int64_t ret; - + if ((src->supports & ZIP_SOURCE_MAKE_COMMAND_BITMASK(command)) == 0) { zip_error_set(&src->error, ZIP_ER_OPNOTSUPP, 0); return -1; } @@ -50,13 +49,13 @@ _zip_source_call(zip_source_t *src, void *data, zip_uint64_t length, zip_source_ } else { ret = src->cb.l(src->src, src->ud, data, length, command); } - + if (ret < 0) { if (command != ZIP_SOURCE_ERROR && command != ZIP_SOURCE_SUPPORTS) { int e[2]; - + if (_zip_source_call(src, e, sizeof(e), ZIP_SOURCE_ERROR) < 0) { zip_error_set(&src->error, ZIP_ER_INTERNAL, 0); } else { |