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

Fix formatting of preprocessor defines

Browse Source
This commit is contained in:
Nathan Moinvaziri 2014-01-07 19:13:14 -07:00
parent 8e60f1fbf9
commit aea0ac41b7
7 changed files with 116 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ioapi.c
View File

@ -13,29 +13,29 @@
#include "ioapi.h"
#if defined(_WIN32)
#define snprintf _snprintf
# define snprintf _snprintf
#endif
#if defined(__APPLE__) || defined(IOAPI_NO_64)
#ifdef __APPLE__
/* In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions */
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
# define FOPEN_FUNC(filename, mode) fopen(filename, mode)
# define FTELLO_FUNC(stream) ftello(stream)
# define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
#else
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
#define FTELLO_FUNC(stream) ftello64(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
# define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
# define FTELLO_FUNC(stream) ftello64(stream)
# define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
#endif
/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
#ifndef SEEK_CUR
#define SEEK_CUR 1
# define SEEK_CUR 1
#endif
#ifndef SEEK_END
#define SEEK_END 2
# define SEEK_END 2
#endif
#ifndef SEEK_SET
#define SEEK_SET 0
# define SEEK_SET 0
#endif
voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)

6
iowin32.c
View File

@ -16,15 +16,15 @@
#include "iowin32.h"
#ifndef INVALID_HANDLE_VALUE
#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
# define INVALID_HANDLE_VALUE (0xFFFFFFFF)
#endif
#ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER ((DWORD)-1)
# define INVALID_SET_FILE_POINTER ((DWORD)-1)
#endif
/*#ifndef IOWIN32_USING_WINRT_API
#define IOWIN32_USING_WINRT_API
# define IOWIN32_USING_WINRT_API
#endif*/
voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode));

66
miniunz.c
View File

@ -13,35 +13,29 @@
*/
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
#ifndef __USE_FILE_OFFSET64
#define __USE_FILE_OFFSET64
#endif
#ifndef __USE_LARGEFILE64
#define __USE_LARGEFILE64
#endif
#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
#endif
#ifndef _FILE_OFFSET_BIT
#define _FILE_OFFSET_BIT 64
#endif
#endif
#if (defined(_WIN32))
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
# ifndef __USE_FILE_OFFSET64
# define __USE_FILE_OFFSET64
# endif
# ifndef __USE_LARGEFILE64
# define __USE_LARGEFILE64
# endif
# ifndef _LARGEFILE64_SOURCE
# define _LARGEFILE64_SOURCE
# endif
# ifndef _FILE_OFFSET_BIT
# define _FILE_OFFSET_BIT 64
# endif
#endif
#ifdef __APPLE__
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
/* In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions */
# define FOPEN_FUNC(filename, mode) fopen(filename, mode)
# define FTELLO_FUNC(stream) ftello(stream)
# define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
#else
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
#define FTELLO_FUNC(stream) ftello64(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
# define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
# define FTELLO_FUNC(stream) ftello64(stream)
# define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
#endif
#include <stdio.h>
@ -52,20 +46,20 @@
#include <fcntl.h>
#ifdef _WIN32
# include <direct.h>
# include <io.h>
# include <direct.h>
# include <io.h>
#else
# include <sys/stat.h>
# include <unistd.h>
# include <utime.h>
# include <sys/stat.h>
# include <unistd.h>
# include <utime.h>
#endif
#ifdef _WIN32
#define MKDIR(d) _mkdir(d)
#define CHDIR(d) _chdir(d)
# define MKDIR(d) _mkdir(d)
# define CHDIR(d) _chdir(d)
#else
#define MKDIR(d) mkdir(d, 0775)
#define CHDIR(d) chdir(d)
# define MKDIR(d) mkdir(d, 0775)
# define CHDIR(d) chdir(d)
#endif
#include "unzip.h"
@ -74,8 +68,8 @@
#define MAXFILENAME (256)
#ifdef _WIN32
#define USEWIN32IOAPI
#include "iowin32.h"
# define USEWIN32IOAPI
# include "iowin32.h"
#endif
void change_file_date(const char *filename, uLong dosdate, tm_unz tmu_date)

60
minizip.c
View File

@ -13,35 +13,29 @@
*/
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
#ifndef __USE_FILE_OFFSET64
#define __USE_FILE_OFFSET64
#endif
#ifndef __USE_LARGEFILE64
#define __USE_LARGEFILE64
#endif
#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
#endif
#ifndef _FILE_OFFSET_BIT
#define _FILE_OFFSET_BIT 64
#endif
#endif
#if (defined(_WIN32))
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
# ifndef __USE_FILE_OFFSET64
# define __USE_FILE_OFFSET64
# endif
# ifndef __USE_LARGEFILE64
# define __USE_LARGEFILE64
# endif
# ifndef _LARGEFILE64_SOURCE
# define _LARGEFILE64_SOURCE
# endif
# ifndef _FILE_OFFSET_BIT
# define _FILE_OFFSET_BIT 64
# endif
#endif
#ifdef __APPLE__
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
/* In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions */
# define FOPEN_FUNC(filename, mode) fopen(filename, mode)
# define FTELLO_FUNC(stream) ftello(stream)
# define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
#else
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
#define FTELLO_FUNC(stream) ftello64(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
# define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
# define FTELLO_FUNC(stream) ftello64(stream)
# define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
#endif
#include <stdio.h>
@ -52,20 +46,20 @@
#include <fcntl.h>
#ifdef _WIN32
# include <direct.h>
# include <io.h>
# include <direct.h>
# include <io.h>
#else
# include <unistd.h>
# include <utime.h>
# include <sys/types.h>
# include <sys/stat.h>
# include <unistd.h>
# include <utime.h>
# include <sys/types.h>
# include <sys/stat.h>
#endif
#include "zip.h"
#ifdef _WIN32
#define USEWIN32IOAPI
#include "iowin32.h"
# define USEWIN32IOAPI
# include "iowin32.h"
#endif
#define WRITEBUFFERSIZE (16384)

36
unzip.c
View File

@ -66,7 +66,7 @@
#include <string.h>
/*#ifndef NOUNCRYPT
#define NOUNCRYPT
# define NOUNCRYPT
#endif*/
#include "zlib.h"
@ -78,24 +78,24 @@
# include <stdlib.h>
#endif
#ifdef NO_ERRNO_H
extern int errno;
extern int errno;
#else
# include <errno.h>
# include <errno.h>
#endif
#ifdef HAVE_AES
#define AES_METHOD (99)
#define AES_PWVERIFYSIZE (2)
#define AES_MAXSALTLENGTH (16)
#define AES_AUTHCODESIZE (10)
#define AES_HEADERSIZE (11)
#define AES_KEYSIZE(mode) (64 + (mode * 64))
# define AES_METHOD (99)
# define AES_PWVERIFYSIZE (2)
# define AES_MAXSALTLENGTH (16)
# define AES_AUTHCODESIZE (10)
# define AES_HEADERSIZE (11)
# define AES_KEYSIZE(mode) (64 + (mode * 64))
#include "aes/aes.h"
#include "aes/fileenc.h"
# include "aes/aes.h"
# include "aes/fileenc.h"
#endif
#ifndef NOUNCRYPT
#include "crypt.h"
# include "crypt.h"
#endif
#ifndef local
@ -115,21 +115,21 @@
#define SIZEZIPLOCALHEADER (0x1e)
#ifndef BUFREADCOMMENT
#define BUFREADCOMMENT (0x400)
# define BUFREADCOMMENT (0x400)
#endif
#ifndef UNZ_BUFSIZE
#define UNZ_BUFSIZE (64 * 1024)
# define UNZ_BUFSIZE (64 * 1024)
#endif
#ifndef UNZ_MAXFILENAMEINZIP
#define UNZ_MAXFILENAMEINZIP (256)
# define UNZ_MAXFILENAMEINZIP (256)
#endif
#ifndef ALLOC
# define ALLOC(size) (malloc(size))
# define ALLOC(size) (malloc(size))
#endif
#ifndef TRYFREE
# define TRYFREE(p) {if (p) free(p);}
# define TRYFREE(p) {if (p) free(p);}
#endif
const char unz_copyright[] =
@ -581,7 +581,7 @@ local unzFile unzOpenInternal(const void *path, zlib_filefunc64_32_def* pzlib_fi
us.pfile_in_zip_read = NULL;
us.encrypted = 0;
s =(unz64_s*)ALLOC(sizeof(unz64_s));
s = (unz64_s*)ALLOC(sizeof(unz64_s));
if (s != NULL)
{
*s = us;

49
zip.c
View File

@ -26,7 +26,6 @@
May-2012 - Nathan Moinvaziri - Added AES encryption support
Jul-2012 - Nathan Moinvaziri - Clean up, removed zipRemoveExtraInfoBlock
------------------------------------------------------------------------------------
*/
#include <stdio.h>
@ -48,22 +47,22 @@
#endif
#ifdef HAVE_AES
#define AES_METHOD (99)
#define AES_PWVERIFYSIZE (2)
#define AES_AUTHCODESIZE (10)
#define AES_MAXSALTLENGTH (16)
#define AES_VERSION (0x0001)
#define AES_ENCRYPTIONMODE (0x03)
# define AES_METHOD (99)
# define AES_PWVERIFYSIZE (2)
# define AES_AUTHCODESIZE (10)
# define AES_MAXSALTLENGTH (16)
# define AES_VERSION (0x0001)
# define AES_ENCRYPTIONMODE (0x03)
#include "aes/aes.h"
#include "aes/fileenc.h"
#include "aes/prng.h"
#include "aes/entropy.h"
# include "aes/aes.h"
# include "aes/fileenc.h"
# include "aes/prng.h"
# include "aes/entropy.h"
#endif
#ifndef NOCRYPT
#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
#include "crypt.h"
# define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
# include "crypt.h"
#endif
#ifndef local
@ -89,38 +88,38 @@
#define SIZEZIPLOCALHEADER (0x1e)
#ifndef BUFREADCOMMENT
#define BUFREADCOMMENT (0x400)
# define BUFREADCOMMENT (0x400)
#endif
#ifndef VERSIONMADEBY
#define VERSIONMADEBY (0x0) /* platform dependent */
# define VERSIONMADEBY (0x0) /* platform dependent */
#endif
#ifndef Z_BUFSIZE
#define Z_BUFSIZE (64*1024)
# define Z_BUFSIZE (64*1024)
#endif
#ifndef Z_MAXFILENAMEINZIP
#define Z_MAXFILENAMEINZIP (256)
# define Z_MAXFILENAMEINZIP (256)
#endif
#ifndef ALLOC
# define ALLOC(size) (malloc(size))
# define ALLOC(size) (malloc(size))
#endif
#ifndef TRYFREE
# define TRYFREE(p) {if (p) free(p);}
# define TRYFREE(p) {if (p) free(p);}
#endif
// NOT sure that this work on ALL platform
#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
#ifndef DEF_MEM_LEVEL
#if MAX_MEM_LEVEL >= 8
# define DEF_MEM_LEVEL 8
#else
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
#endif
# if MAX_MEM_LEVEL >= 8
# define DEF_MEM_LEVEL 8
# else
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
# endif
#endif
const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
const char zip_copyright[] = " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
typedef struct linkedlist_datablock_internal_s
{

6
zip.h
View File

@ -38,15 +38,15 @@ extern "C" {
#endif
#ifndef _ZLIB_H
#include "zlib.h"
# include "zlib.h"
#endif
#ifndef _ZLIBIOAPI_H
#include "ioapi.h"
# include "ioapi.h"
#endif
#ifdef HAVE_BZIP2
#include "bzlib.h"
# include "bzlib.h"
#endif
#define Z_BZIP2ED 12