c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed empty lines.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2022-11-29 17:17:07 -08:00
parent 6efe5c0fe6
commit 848c3e3503
21 changed files with 0 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
minigzip.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_os.h"
#include "mz_strm.h"
@ -53,7 +52,6 @@ int32_t minigzip_copy(const char *path, const char *destination, int16_t operati
char target_path[1024];
int32_t err = 0;
memset(target_path, 0, sizeof(target_path));
if (destination != NULL) {
@ -134,7 +132,6 @@ int main(int argc, const char *argv[]) {
const char *path = NULL;
const char *destination = NULL;
minigzip_banner();
if (argc == 1) {
minigzip_help();

3
minizip.c
View File

@ -10,7 +10,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_os.h"
#include "mz_strm.h"
@ -353,7 +352,6 @@ int32_t minizip_extract(const char *path, const char *pattern, const char *desti
int32_t err = MZ_OK;
int32_t err_close = MZ_OK;
printf("Archive %s\n", path);
/* Create zip reader */
@ -525,7 +523,6 @@ int main(int argc, const char *argv[]) {
const char *destination = NULL;
const char *filename_to_extract = NULL;
minizip_banner();
if (argc == 1) {
minizip_help();

1
mz_compat.c
View File

@ -10,7 +10,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_os.h"
#include "mz_strm.h"

1
mz_crypt.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_os.h"
#include "mz_crypt.h"

4
mz_crypt_apple.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include <CoreFoundation/CoreFoundation.h>
@ -239,7 +238,6 @@ int32_t mz_crypt_aes_decrypt(void *handle, uint8_t *buf, int32_t size) {
int32_t mz_crypt_aes_set_encrypt_key(void *handle, const void *key, int32_t key_length) {
mz_crypt_aes *aes = (mz_crypt_aes *)handle;
if (aes == NULL || key == NULL || key_length == 0)
return MZ_PARAM_ERROR;
@ -257,7 +255,6 @@ int32_t mz_crypt_aes_set_encrypt_key(void *handle, const void *key, int32_t key_
int32_t mz_crypt_aes_set_decrypt_key(void *handle, const void *key, int32_t key_length) {
mz_crypt_aes *aes = (mz_crypt_aes *)handle;
if (aes == NULL || key == NULL || key_length == 0)
return MZ_PARAM_ERROR;
@ -432,7 +429,6 @@ int32_t mz_crypt_sign(uint8_t *message, int32_t message_size, uint8_t *cert_data
const void *options_values[2] = { 0, kCFBooleanTrue };
int32_t err = MZ_SIGN_ERROR;
if (message == NULL || cert_data == NULL || signature == NULL || signature_size == NULL)
return MZ_PARAM_ERROR;

5
mz_crypt_openssl.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include <openssl/err.h>
@ -273,7 +272,6 @@ int32_t mz_crypt_aes_set_encrypt_key(void *handle, const void *key, int32_t key_
int32_t result = 0;
int32_t key_bits = 0;
if (aes == NULL || key == NULL)
return MZ_PARAM_ERROR;
@ -294,7 +292,6 @@ int32_t mz_crypt_aes_set_decrypt_key(void *handle, const void *key, int32_t key_
int32_t result = 0;
int32_t key_bits = 0;
if (aes == NULL || key == NULL)
return MZ_PARAM_ERROR;
@ -516,7 +513,6 @@ int32_t mz_crypt_sign(uint8_t *message, int32_t message_size, uint8_t *cert_data
int32_t result = 0;
int32_t err = MZ_OK;
if (message == NULL || cert_data == NULL || signature == NULL || signature_size == NULL)
return MZ_PARAM_ERROR;
@ -600,7 +596,6 @@ int32_t mz_crypt_sign_verify(uint8_t *message, int32_t message_size, uint8_t *si
int32_t i = 0;
int32_t err = MZ_SIGN_ERROR;
if (message == NULL || message_size == 0 || signature == NULL || signature_size == 0)
return MZ_PARAM_ERROR;

6
mz_crypt_win32.c
View File

@ -21,7 +21,6 @@ int32_t mz_crypt_rand(uint8_t *buf, int32_t size) {
HCRYPTPROV provider;
int32_t result = 0;
result = CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT);
if (result) {
result = CryptGenRandom(provider, size, buf);
@ -211,7 +210,6 @@ int32_t mz_crypt_sha_begin(void *handle) {
int32_t result = 0;
int32_t err = MZ_OK;
if (sha == NULL)
return MZ_PARAM_ERROR;
@ -414,7 +412,6 @@ static int32_t mz_crypt_aes_set_key(void *handle, const void *key, int32_t key_l
int32_t result = 0;
int32_t err = MZ_OK;
if (aes == NULL || key == NULL)
return MZ_PARAM_ERROR;
@ -548,7 +545,6 @@ int32_t mz_crypt_hmac_init(void *handle, const void *key, int32_t key_length) {
int32_t result = 0;
int32_t err = MZ_OK;
if (hmac == NULL || key == NULL)
return MZ_PARAM_ERROR;
@ -710,7 +706,6 @@ int32_t mz_crypt_sign(uint8_t *message, int32_t message_size, uint8_t *cert_data
uint32_t messages_sizes[1];
uint8_t *messages[1];
if (message == NULL || cert_data == NULL || signature == NULL || signature_size == NULL)
return MZ_PARAM_ERROR;
@ -822,7 +817,6 @@ int32_t mz_crypt_sign_verify(uint8_t *message, int32_t message_size, uint8_t *si
uint8_t *decoded = NULL;
int32_t decoded_size = 0;
memset(&verify_params, 0, sizeof(verify_params));
verify_params.cbSize = sizeof(verify_params);

2
mz_os.c
View File

@ -130,7 +130,6 @@ int32_t mz_path_resolve(const char *path, char *output, int32_t max_output) {
const char *check = output;
char *target = output;
if (max_output <= 0)
return MZ_PARAM_ERROR;
@ -284,7 +283,6 @@ int32_t mz_dir_make(const char *path) {
char *match = NULL;
char hold = 0;
len = strlen(path);
if (len <= 0 || len > INT16_MAX)
return 0;

2
mz_os_win32.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_os.h"
#include "mz_strm_os.h"
@ -378,7 +377,6 @@ DIR *mz_os_open_dir(const char *path) {
char fixed_path[320];
void *handle = NULL;
if (path == NULL)
return NULL;

1
mz_strm_bzip.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_strm.h"
#include "mz_strm_bzip.h"

3
mz_strm_libcomp.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_strm.h"
#include "mz_strm_libcomp.h"
@ -197,7 +196,6 @@ static int32_t mz_stream_libcomp_deflate(void *stream, int flush) {
uint32_t out_bytes = 0;
int32_t err = MZ_OK;
do {
if (libcomp->cstream.dst_size == 0) {
err = mz_stream_libcomp_flush(libcomp);
@ -267,7 +265,6 @@ int32_t mz_stream_libcomp_seek(void *stream, int64_t offset, int32_t origin) {
int32_t mz_stream_libcomp_close(void *stream) {
mz_stream_libcomp *libcomp = (mz_stream_libcomp *)stream;
if (libcomp->mode & MZ_OPEN_MODE_WRITE) {
#ifdef MZ_ZIP_NO_COMPRESSION
return MZ_SUPPORT_ERROR;

2
mz_strm_lzma.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_strm.h"
#include "mz_strm_lzma.h"
@ -287,7 +286,6 @@ static int32_t mz_stream_lzma_code(void *stream, int32_t flush) {
uint32_t out_bytes = 0;
int32_t err = LZMA_OK;
do {
if (lzma->lstream.avail_out == 0) {
err = mz_stream_lzma_flush(lzma);

2
mz_strm_mem.c
View File

@ -16,7 +16,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_strm.h"
#include "mz_strm_mem.h"
@ -57,7 +56,6 @@ static int32_t mz_stream_mem_set_size(void *stream, int32_t size) {
int32_t new_size = size;
uint8_t *new_buf = NULL;
new_buf = (uint8_t *)MZ_ALLOC((uint32_t)new_size);
if (new_buf == NULL)
return MZ_BUF_ERROR;

1
mz_strm_os_posix.c
View File

@ -13,7 +13,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_strm.h"
#include "mz_strm_os.h"

3
mz_strm_os_win32.c
View File

@ -13,7 +13,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_os.h"
#include "mz_strm.h"
@ -80,7 +79,6 @@ int32_t mz_stream_os_open(void *stream, const char *path, int32_t mode) {
uint32_t flags_attribs = FILE_ATTRIBUTE_NORMAL;
wchar_t *path_wide = NULL;
if (path == NULL)
return MZ_PARAM_ERROR;
@ -221,7 +219,6 @@ int32_t mz_stream_os_seek(void *stream, int64_t offset, int32_t origin) {
int32_t err = MZ_OK;
LARGE_INTEGER large_pos;
if (mz_stream_os_is_open(stream) != MZ_OK)
return MZ_OPEN_ERROR;

2
mz_strm_pkcrypt.c
View File

@ -21,7 +21,6 @@
version without encryption capabilities).
*/
#include "mz.h"
#include "mz_crypt.h"
#include "mz_strm.h"
@ -188,7 +187,6 @@ int32_t mz_stream_pkcrypt_read(void *stream, void *buf, int32_t size) {
int32_t read = 0;
int32_t i = 0;
if ((int64_t)bytes_to_read > (pkcrypt->max_total_in - pkcrypt->total_in))
bytes_to_read = (int32_t)(pkcrypt->max_total_in - pkcrypt->total_in);

2
mz_strm_split.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_os.h"
#include "mz_strm.h"
@ -80,7 +79,6 @@ static int32_t mz_stream_split_open_disk(void *stream, int32_t number_disk) {
int32_t err = MZ_OK;
int16_t disk_part = 0;
/* Check if we are reading or writing a disk part or the cd disk */
if (number_disk >= 0) {
if ((split->mode & MZ_OPEN_MODE_WRITE) == 0)

1
mz_strm_wzaes.c
View File

@ -9,7 +9,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_crypt.h"
#include "mz_strm.h"

3
mz_strm_zlib.c
View File

@ -8,7 +8,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_strm.h"
#include "mz_strm_zlib.h"
@ -217,7 +216,6 @@ static int32_t mz_stream_zlib_deflate(void *stream, int flush) {
int32_t out_bytes = 0;
int32_t err = Z_OK;
do {
if (zlib->zstream.avail_out == 0) {
err = mz_stream_zlib_flush(zlib);
@ -291,7 +289,6 @@ int32_t mz_stream_zlib_seek(void *stream, int64_t offset, int32_t origin) {
int32_t mz_stream_zlib_close(void *stream) {
mz_stream_zlib *zlib = (mz_stream_zlib *)stream;
if (zlib->mode & MZ_OPEN_MODE_WRITE) {
#ifdef MZ_ZIP_NO_COMPRESSION
return MZ_SUPPORT_ERROR;

10
mz_zip.c
View File

@ -15,7 +15,6 @@
See the accompanying LICENSE file for the full text of the license.
*/
#include "mz.h"
#include "mz_crypt.h"
#include "mz_strm.h"
@ -152,7 +151,6 @@ static int32_t mz_zip_search_zip64_eocd(void *stream, const int64_t end_central_
uint32_t value32 = 0;
int32_t err = MZ_OK;
*central_pos = 0;
/* Zip64 end of central directory locator */
@ -222,7 +220,6 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
int32_t err = MZ_OK;
char *linkname = NULL;
memset(file_info, 0, sizeof(mz_zip_file));
/* Check the magic */
@ -487,7 +484,6 @@ static int32_t mz_zip_entry_read_descriptor(void *stream, uint8_t zip64, uint32_
int64_t value64 = 0;
int32_t err = MZ_OK;
err = mz_stream_read_uint32(stream, &value32);
if (value32 != MZ_ZIP_MAGIC_DATADESCRIPTOR)
err = MZ_FORMAT_ERROR;
@ -959,7 +955,6 @@ static int32_t mz_zip_read_cd(void *handle) {
int32_t comment_read = 0;
int32_t err = MZ_OK;
if (zip == NULL)
return MZ_PARAM_ERROR;
@ -1078,7 +1073,6 @@ static int32_t mz_zip_read_cd(void *handle) {
if (err == MZ_OK)
err = mz_stream_read_uint32(zip->stream, &zip->cd_signature);
if ((err == MZ_OK) && (zip->cd_signature == MZ_ZIP_MAGIC_CENTRALHEADER)) {
/* If found compensate for incorrect locations */
value64i = zip->cd_offset;
zip->cd_offset = eocd_pos - zip->cd_size;
@ -1109,7 +1103,6 @@ static int32_t mz_zip_write_cd(void *handle) {
int32_t comment_size = 0;
int32_t err = MZ_OK;
if (zip == NULL)
return MZ_PARAM_ERROR;
@ -1259,7 +1252,6 @@ static int32_t mz_zip_recover_cd(void *handle) {
uint8_t zip64 = 0;
uint8_t eof = 0;
mz_zip_print("Zip - Recover - Start\n");
mz_zip_get_cd_mem_stream(handle, &cd_mem_stream);
@ -1434,7 +1426,6 @@ int32_t mz_zip_open(void *handle, void *stream, int32_t mode) {
mz_zip *zip = (mz_zip *)handle;
int32_t err = MZ_OK;
if (zip == NULL)
return MZ_PARAM_ERROR;
@ -2582,7 +2573,6 @@ int32_t mz_zip_extrafield_find(void *stream, uint16_t type, int32_t max_seek, ui
uint16_t field_type = 0;
uint16_t field_length = 0;
if (max_seek < 4)
return MZ_EXIST_ERROR;

14
mz_zip_rw.c
View File

@ -101,7 +101,6 @@ int32_t mz_zip_reader_open_file(void *handle, const char *path) {
mz_zip_reader *reader = (mz_zip_reader *)handle;
int32_t err = MZ_OK;
mz_zip_reader_close(handle);
mz_stream_os_create(&reader->file_stream);
@ -123,7 +122,6 @@ int32_t mz_zip_reader_open_file_in_memory(void *handle, const char *path) {
int64_t file_size = 0;
int32_t err = 0;
mz_zip_reader_close(handle);
mz_stream_os_create(&file_stream);
@ -229,7 +227,6 @@ int32_t mz_zip_reader_unzip_cd(void *handle) {
uint64_t number_entry = 0;
int32_t err = MZ_OK;
err = mz_zip_reader_goto_first_entry(handle);
if (err != MZ_OK)
return err;
@ -358,7 +355,6 @@ int32_t mz_zip_reader_entry_open(void *handle) {
const char *password = NULL;
char password_buf[120];
reader->entry_verified = 0;
if (mz_zip_reader_is_open(reader) != MZ_OK)
@ -597,7 +593,6 @@ int32_t mz_zip_reader_entry_save_process(void *handle, void *stream, mz_stream_w
int32_t read = 0;
int32_t written = 0;
if (mz_zip_reader_is_open(reader) != MZ_OK)
return MZ_PARAM_ERROR;
if (reader->file_info == NULL)
@ -1066,7 +1061,6 @@ int32_t mz_zip_writer_zip_cd(void *handle) {
void *file_extra_stream = NULL;
void *cd_mem_stream = NULL;
memset(&cd_file, 0, sizeof(cd_file));
mz_zip_get_number_entry(writer->zip_handle, &number_entry);
@ -1208,7 +1202,6 @@ int32_t mz_zip_writer_open_file_in_memory(void *handle, const char *path) {
int64_t file_size = 0;
int32_t err = 0;
mz_zip_writer_close(handle);
mz_stream_os_create(&file_stream);
@ -1255,7 +1248,6 @@ int32_t mz_zip_writer_close(void *handle) {
mz_zip_writer *writer = (mz_zip_writer *)handle;
int32_t err = MZ_OK;
if (writer->zip_handle != NULL) {
mz_zip_set_version_madeby(writer->zip_handle, MZ_VERSION_MADEBY);
if (writer->comment)
@ -1334,7 +1326,6 @@ int32_t mz_zip_writer_entry_sign(void *handle, uint8_t *message, int32_t message
int32_t signature_size = 0;
uint8_t *signature = NULL;
if (writer == NULL || cert_data == NULL || cert_data_size <= 0)
return MZ_PARAM_ERROR;
if (mz_zip_entry_is_open(writer->zip_handle) != MZ_OK)
@ -1370,7 +1361,6 @@ int32_t mz_zip_writer_entry_close(void *handle) {
int16_t field_length_hash = 0;
uint8_t sha256[MZ_HASH_SHA256_SIZE];
if (writer->sha256 != NULL) {
mz_crypt_sha_end(writer->sha256, sha256, sizeof(sha256));
mz_crypt_sha_delete(&writer->sha256);
@ -1513,7 +1503,6 @@ int32_t mz_zip_writer_add_info(void *handle, void *stream, mz_stream_read_cb rea
mz_zip_writer *writer = (mz_zip_writer *)handle;
int32_t err = MZ_OK;
if (mz_zip_writer_is_open(handle) != MZ_OK)
return MZ_PARAM_ERROR;
if (file_info == NULL)
@ -1569,7 +1558,6 @@ int32_t mz_zip_writer_add_file(void *handle, const char *path, const char *filen
char link_path[1024];
const char *filename = filename_in_zip;
if (mz_zip_writer_is_open(handle) != MZ_OK)
return MZ_PARAM_ERROR;
if (path == NULL)
@ -1650,7 +1638,6 @@ int32_t mz_zip_writer_add_path(void *handle, const char *path, const char *root_
char full_path[1024];
char path_dir[1024];
if (strrchr(path, '*') != NULL) {
strncpy(path_dir, path, sizeof(path_dir) - 1);
path_dir[sizeof(path_dir) - 1] = 0;
@ -1731,7 +1718,6 @@ int32_t mz_zip_writer_copy_from_reader(void *handle, void *reader) {
void *reader_zip_handle = NULL;
void *writer_zip_handle = NULL;
if (mz_zip_reader_is_open(reader) != MZ_OK)
return MZ_PARAM_ERROR;
if (mz_zip_writer_is_open(writer) != MZ_OK)