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

Fixed compiler errors and warnings on mac.

Browse Source 
Added liblzma project for mac.
This commit is contained in:
Nathan Moinvaziri 2017-10-05 00:02:07 -07:00
parent d8684909df
commit 32efd9bb5f
11 changed files with 1201 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
mac/liblzma.xcodeproj/project.pbxproj Normal file
View File

@ -0,0 +1,240 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXFileReference section */
D81CA97E1F86049000417286 /* libliblzma.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libliblzma.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
D81CA97B1F86049000417286 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
D81CA9751F86049000417286 = {
isa = PBXGroup;
children = (
D81CA97F1F86049000417286 /* Products */,
);
sourceTree = "<group>";
};
D81CA97F1F86049000417286 /* Products */ = {
isa = PBXGroup;
children = (
D81CA97E1F86049000417286 /* libliblzma.a */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
D81CA97C1F86049000417286 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
D81CA97D1F86049000417286 /* liblzma */ = {
isa = PBXNativeTarget;
buildConfigurationList = D81CA9821F86049000417286 /* Build configuration list for PBXNativeTarget "liblzma" */;
buildPhases = (
D81CA97A1F86049000417286 /* Sources */,
D81CA97B1F86049000417286 /* Frameworks */,
D81CA97C1F86049000417286 /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = liblzma;
productName = liblzma;
productReference = D81CA97E1F86049000417286 /* libliblzma.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
D81CA9761F86049000417286 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = "Solid State Networks";
TargetAttributes = {
D81CA97D1F86049000417286 = {
CreatedOnToolsVersion = 8.3.3;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = D81CA9791F86049000417286 /* Build configuration list for PBXProject "liblzma" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = D81CA9751F86049000417286;
productRefGroup = D81CA97F1F86049000417286 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
D81CA97D1F86049000417286 /* liblzma */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
D81CA97A1F86049000417286 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
D81CA9801F86049000417286 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
name = Debug;
};
D81CA9811F86049000417286 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
name = Release;
};
D81CA9831F86049000417286 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
EXECUTABLE_PREFIX = lib;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
D81CA9841F86049000417286 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
EXECUTABLE_PREFIX = lib;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
D81CA9791F86049000417286 /* Build configuration list for PBXProject "liblzma" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D81CA9801F86049000417286 /* Debug */,
D81CA9811F86049000417286 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D81CA9821F86049000417286 /* Build configuration list for PBXNativeTarget "liblzma" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D81CA9831F86049000417286 /* Debug */,
D81CA9841F86049000417286 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */
};
rootObject = D81CA9761F86049000417286 /* Project object */;
}

7
mac/liblzma.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:liblzma.xcodeproj">
</FileRef>
</Workspace>

1079
mac/minizip.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

5
mz_strm_buf.c
View File

@ -51,8 +51,8 @@ typedef struct mz_stream_buffered_s {
int32_t mz_stream_buffered_open(void *stream, const char *path, int mode)
{
mz_stream_buffered *buffered = (mz_stream_buffered *)stream;
mz_stream_buffered_print(opaque, buffered, "open [num %d mode %d]\n", number_disk, mode);
//mz_stream_buffered *buffered = (mz_stream_buffered *)stream;
//mz_stream_buffered_print(opaque, buffered, "open [num %d mode %d]\n", number_disk, mode);
return mz_stream_open(stream, path, mode);
}
@ -159,7 +159,6 @@ int32_t mz_stream_buffered_write(void *stream, const void *buf, uint32_t size)
uint32_t bytes_to_copy = 0;
uint32_t bytes_used = 0;
uint32_t bytes_flushed = 0;
int64_t ret = 0;
mz_stream_buffered_print(opaque, stream, "write [size %ld len %d pos %lld]\n", size, buffered->writebuf_len, buffered->position);

18
mz_strm_bzip.c
View File

@ -14,7 +14,7 @@
#include <stdint.h>
#include <string.h>
#include "bzip2\bzlib.h"
#include "bzip2/bzlib.h"
#include "mz_strm.h"
#include "mz_strm_bzip.h"
@ -55,14 +55,14 @@ int32_t mz_stream_bzip_open(void *stream, const char *path, int mode)
if (mode & MZ_STREAM_MODE_READ)
{
bzip->bzstream.next_in = bzip->buffer;
bzip->bzstream.next_in = (char *)bzip->buffer;
bzip->bzstream.avail_in = 0;
bzip->error = BZ2_bzDecompressInit(&bzip->bzstream, 0, 0);
}
else if (mode & MZ_STREAM_MODE_WRITE)
{
bzip->bzstream.next_out = bzip->buffer;
bzip->bzstream.next_out = (char *)bzip->buffer;
bzip->bzstream.avail_out = sizeof(bzip->buffer);
bzip->error = BZ2_bzCompressInit(&bzip->bzstream, bzip->level, 0, 35);
@ -95,7 +95,7 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, uint32_t size)
int32_t read = 0;
int16_t err = BZ_OK;
bzip->bzstream.next_out = (uint8_t*)buf;
bzip->bzstream.next_out = (char *)buf;
bzip->bzstream.avail_out = (uint16_t)size;
do
@ -120,7 +120,7 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, uint32_t size)
bzip->total_in += read;
bzip->bzstream.next_in = bzip->buffer;
bzip->bzstream.next_in = (char *)bzip->buffer;
bzip->bzstream.avail_in = read;
}
@ -192,7 +192,7 @@ int32_t mz_stream_bzip_write(void *stream, const void *buf, uint32_t size)
uint32_t total_out = 0;
bzip->bzstream.next_in = (uint8_t*)buf;
bzip->bzstream.next_in = (char *)buf;
bzip->bzstream.avail_in = size;
while ((bzip->error == BZ_OK) && (bzip->bzstream.avail_in > 0))
@ -206,7 +206,7 @@ int32_t mz_stream_bzip_write(void *stream, const void *buf, uint32_t size)
}
bzip->bzstream.avail_out = sizeof(bzip->buffer);
bzip->bzstream.next_out = bzip->buffer;
bzip->bzstream.next_out = (char *)bzip->buffer;
bzip->buffer_len = 0;
}
@ -225,13 +225,11 @@ int32_t mz_stream_bzip_write(void *stream, const void *buf, uint32_t size)
int64_t mz_stream_bzip_tell(void *stream)
{
mz_stream_bzip *mem = (mz_stream_bzip *)stream;
return MZ_STREAM_ERROR;
}
int32_t mz_stream_bzip_seek(void *stream, uint64_t offset, int origin)
{
mz_stream_bzip *bzip = (mz_stream_bzip *)stream;
return MZ_STREAM_ERROR;
}
@ -334,4 +332,4 @@ void mz_stream_bzip_delete(void **stream)
extern void bz_internal_error(int errcode)
{
}
}

4
mz_strm_crypt.c
View File

@ -110,8 +110,6 @@ int32_t mz_stream_crypt_open(void *stream, const char *path, int mode)
uint16_t t = 0;
int16_t i = 0;
uint8_t header[RAND_HEAD_LEN];
uint8_t verify1 = 0;
uint8_t verify2 = 0;
const char *password = path;
crypt->total_in = 0;
@ -299,4 +297,4 @@ void mz_stream_crypt_delete(void **stream)
crypt = (mz_stream_crypt *)*stream;
if (crypt != NULL)
free(crypt);
}
}

2
mz_strm_lzma.c
View File

@ -245,13 +245,11 @@ int32_t mz_stream_lzma_write(void *stream, const void *buf, uint32_t size)
int64_t mz_stream_lzma_tell(void *stream)
{
mz_stream_lzma *mem = (mz_stream_lzma *)stream;
return MZ_STREAM_ERROR;
}
int32_t mz_stream_lzma_seek(void *stream, uint64_t offset, int origin)
{
mz_stream_lzma *lzma = (mz_stream_lzma *)stream;
return MZ_STREAM_ERROR;
}

4
mz_strm_posix.c
View File

@ -22,13 +22,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/utime.h>
#if defined unix || defined __APPLE__
# include <unistd.h>
# include <utime.h>
# include <fcntl.h>
#elif defined _WIN32
# include <sys/utime.h>
# include <direct.h>
# include <io.h>
# define chdir(x) _chdir(x)
@ -294,4 +294,4 @@ int16_t mz_posix_make_dir(const char *path)
if (mkdir(path, 0755) != 0)
return MZ_INTERNAL_ERROR;
return MZ_OK;
}
}

18
mz_strm_zlib.c
View File

@ -104,8 +104,8 @@ int32_t mz_stream_zlib_is_open(void *stream)
int32_t mz_stream_zlib_read(void *stream, void *buf, uint32_t size)
{
mz_stream_zlib *zlib = (mz_stream_zlib *)stream;
uint32_t total_out_before = 0;
uint32_t total_out_after = 0;
uint64_t total_out_before = 0;
uint64_t total_out_after = 0;
uint32_t out_bytes = 0;
uint32_t total_out = 0;
int32_t bytes_to_read = 0;
@ -154,7 +154,7 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, uint32_t size)
total_out_after = zlib->zstream.total_out;
out_bytes = total_out_after - total_out_before;
out_bytes = (uint32_t)(total_out_after - total_out_before);
total_out += out_bytes;
if (err == Z_STREAM_END)
@ -185,8 +185,8 @@ int32_t mz_stream_zlib_flush(void *stream)
uint32_t mz_stream_zlib_deflate(void *stream, int flush)
{
mz_stream_zlib *zlib = (mz_stream_zlib *)stream;
uint32_t total_out_before = 0;
uint32_t total_out_after = 0;
uint64_t total_out_before = 0;
uint64_t total_out_after = 0;
uint32_t out_bytes = 0;
int16_t err = Z_OK;
@ -245,13 +245,11 @@ int32_t mz_stream_zlib_write(void *stream, const void *buf, uint32_t size)
int64_t mz_stream_zlib_tell(void *stream)
{
mz_stream_zlib *mem = (mz_stream_zlib *)stream;
return MZ_STREAM_ERROR;
}
int32_t mz_stream_zlib_seek(void *stream, uint64_t offset, int origin)
{
mz_stream_zlib *zlib = (mz_stream_zlib *)stream;
return MZ_STREAM_ERROR;
}
@ -410,7 +408,7 @@ int32_t mz_stream_crc32_read(void *stream, void *buf, uint32_t size)
mz_stream_crc32 *crc32x = (mz_stream_crc32 *)stream;
int32_t read = mz_stream_read(crc32x->stream.base, buf, size);
if (read > 0)
crc32x->value = crc32(crc32x->value, buf, read);
crc32x->value = (int32_t)crc32(crc32x->value, buf, read);
crc32x->total_in += read;
return read;
}
@ -419,7 +417,7 @@ int32_t mz_stream_crc32_write(void *stream, const void *buf, uint32_t size)
{
mz_stream_crc32 *crc32x = (mz_stream_crc32 *)stream;
int32_t written = 0;
crc32x->value = crc32(crc32x->value, buf, size);
crc32x->value = (int32_t)crc32(crc32x->value, buf, size);
written = mz_stream_write(crc32x->stream.base, buf, size);
crc32x->total_out += written;
return written;
@ -504,4 +502,4 @@ void mz_stream_crc32_delete(void **stream)
crc32 = (mz_stream_crc32 *)*stream;
if (crc32 != NULL)
free(crc32);
}
}

10
mz_unzip.c
View File

@ -112,7 +112,6 @@ static uint64_t mz_unzip_search_cd(void *stream)
uint64_t pos_found = 0;
uint32_t read_size = 0;
uint64_t read_pos = 0;
uint32_t bytes_read = 0;
uint32_t i = 0;
if (mz_stream_seek(stream, 0, MZ_STREAM_SEEK_END) != 0)
@ -407,7 +406,6 @@ static int mz_unzip_entry_read_header(void *handle)
{
mz_unzip *unzip = NULL;
uint32_t magic = 0;
uint64_t current_pos = 0;
uint32_t extra_pos = 0;
uint16_t extra_header_id = 0;
uint16_t extra_data_size = 0;
@ -482,7 +480,7 @@ static int mz_unzip_entry_read_header(void *handle)
if ((err == MZ_OK) && (unzip->file_info.filename_size > 0))
{
// Read filename in our memory stream buffer
mz_stream_mem_get_buffer(unzip->file_info_stream, &unzip->file_info.filename);
mz_stream_mem_get_buffer(unzip->file_info_stream, (void **)&unzip->file_info.filename);
if (mz_stream_seek(unzip->file_info_stream, 0, MZ_STREAM_SEEK_SET) != MZ_OK)
err = MZ_STREAM_ERROR;
@ -496,7 +494,7 @@ static int mz_unzip_entry_read_header(void *handle)
if ((err == MZ_OK) && (unzip->file_info.extrafield_size > 0))
{
mz_stream_mem_get_buffer_at(unzip->file_info_stream, seek, &unzip->file_info.extrafield);
mz_stream_mem_get_buffer_at(unzip->file_info_stream, seek, (void **)&unzip->file_info.extrafield);
if (mz_stream_copy(unzip->file_info_stream, unzip->stream, unzip->file_info.extrafield_size) != MZ_OK)
err = MZ_STREAM_ERROR;
@ -585,7 +583,7 @@ static int mz_unzip_entry_read_header(void *handle)
if ((err == MZ_OK) && (unzip->file_info.comment_size > 0))
{
mz_stream_mem_get_buffer_at(unzip->file_info_stream, seek, &unzip->file_info.comment);
mz_stream_mem_get_buffer_at(unzip->file_info_stream, seek, (void **)&unzip->file_info.comment);
if (mz_stream_copy(unzip->file_info_stream, unzip->stream, unzip->file_info.comment_size) != MZ_OK)
err = MZ_STREAM_ERROR;
@ -614,7 +612,6 @@ static int mz_unzip_entry_check_header(mz_unzip *unzip, uint32_t *extrainfo_size
uint32_t flags = 0;
uint16_t filename_size = 0;
uint16_t extrafield_size = 0;
uint16_t compression_method = 0;
int err = MZ_OK;
if (extrainfo_size == NULL)
@ -901,7 +898,6 @@ extern int ZEXPORT mz_unzip_entry_get_extrafield_local(void *handle, void *buf,
{
mz_unzip *unzip = NULL;
uint64_t size_to_read = 0;
uint32_t bytes_read = 0;
uint32_t read_now = 0;
if (handle == NULL)

7
mz_zip.c
View File

@ -388,7 +388,6 @@ extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
mz_zip *zip = NULL;
uint16_t filename_size = 0;
uint16_t version_needed = 0;
uint16_t i = 0;
int16_t err = MZ_OK;
#ifdef NOCRYPT
@ -666,7 +665,6 @@ extern int ZEXPORT mz_zip_entry_close_raw(void *handle, uint64_t uncompressed_si
uint16_t filename_size = 0;
uint16_t comment_size = 0;
uint16_t version_needed = 0;
uint32_t i = 0;
int16_t err = MZ_OK;
if (handle == NULL)
@ -844,7 +842,6 @@ extern int ZEXPORT mz_zip_close(void *handle, const char *global_comment, uint16
uint64_t centraldir_pos_inzip = 0;
uint64_t pos = 0;
uint64_t cd_pos = 0;
uint32_t write = 0;
int16_t err = MZ_OK;
if (handle == NULL)
@ -852,7 +849,11 @@ extern int ZEXPORT mz_zip_close(void *handle, const char *global_comment, uint16
zip = (mz_zip*)handle;
if (zip->entry_opened == 1)
{
err = mz_zip_entry_close(handle);
if (err != MZ_OK)
return err;
}
#ifndef NO_ADDFILEINEXISTINGZIP
if (global_comment == NULL)