diff options
Diffstat (limited to 'src/Common/libzip/zip_delete.c')
| -rw-r--r-- | src/Common/libzip/zip_delete.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/Common/libzip/zip_delete.c b/src/Common/libzip/zip_delete.c index e1602101..676c16bf 100644 --- a/src/Common/libzip/zip_delete.c +++ b/src/Common/libzip/zip_delete.c @@ -1,10 +1,10 @@ /* zip_delete.c -- delete file from zip archive - 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 are met: @@ -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,36 +35,34 @@ #include "zipint.h" ZIP_EXTERN int -zip_delete(zip_t *za, zip_uint64_t idx) -{ +zip_delete(zip_t *za, zip_uint64_t idx) { const char *name; if (idx >= za->nentry) { - zip_error_set(&za->error, ZIP_ER_INVAL, 0); - return -1; + zip_error_set(&za->error, ZIP_ER_INVAL, 0); + return -1; } if (ZIP_IS_RDONLY(za)) { - zip_error_set(&za->error, ZIP_ER_RDONLY, 0); - return -1; + zip_error_set(&za->error, ZIP_ER_RDONLY, 0); + return -1; } - if ((name=_zip_get_name(za, idx, 0, &za->error)) == NULL) { - return -1; + if ((name = _zip_get_name(za, idx, 0, &za->error)) == NULL) { + return -1; } if (!_zip_hash_delete(za->names, (const zip_uint8_t *)name, &za->error)) { - return -1; + return -1; } /* allow duplicate file names, because the file will * be removed directly afterwards */ if (_zip_unchange(za, idx, 1) != 0) - return -1; + return -1; za->entry[idx].deleted = 1; return 0; } - |