digest 0.0.0.3 → 0.0.0.4
raw patch · 3 files changed
+3/−604 lines, 3 filesdep ~basedep ~bytestringPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: base, bytestring
API changes (from Hackage documentation)
Files
- cbits/zconf.h +0/−332
- cbits/zutil.h +0/−269
- digest.cabal +3/−3
− cbits/zconf.h
@@ -1,332 +0,0 @@-/* zconf.h -- configuration of the zlib compression library- * Copyright (C) 1995-2005 Jean-loup Gailly.- * For conditions of distribution and use, see copyright notice in zlib.h- */--/* @(#) $Id$ */--#ifndef ZCONF_H-#define ZCONF_H--/*- * If you *really* need a unique prefix for all types and library functions,- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.- */-#ifdef Z_PREFIX-# define deflateInit_ z_deflateInit_-# define deflate z_deflate-# define deflateEnd z_deflateEnd-# define inflateInit_ z_inflateInit_-# define inflate z_inflate-# define inflateEnd z_inflateEnd-# define deflateInit2_ z_deflateInit2_-# define deflateSetDictionary z_deflateSetDictionary-# define deflateCopy z_deflateCopy-# define deflateReset z_deflateReset-# define deflateParams z_deflateParams-# define deflateBound z_deflateBound-# define deflatePrime z_deflatePrime-# define inflateInit2_ z_inflateInit2_-# define inflateSetDictionary z_inflateSetDictionary-# define inflateSync z_inflateSync-# define inflateSyncPoint z_inflateSyncPoint-# define inflateCopy z_inflateCopy-# define inflateReset z_inflateReset-# define inflateBack z_inflateBack-# define inflateBackEnd z_inflateBackEnd-# define compress z_compress-# define compress2 z_compress2-# define compressBound z_compressBound-# define uncompress z_uncompress-# define adler32 z_adler32-# define crc32 z_crc32-# define get_crc_table z_get_crc_table-# define zError z_zError--# define alloc_func z_alloc_func-# define free_func z_free_func-# define in_func z_in_func-# define out_func z_out_func-# define Byte z_Byte-# define uInt z_uInt-# define uLong z_uLong-# define Bytef z_Bytef-# define charf z_charf-# define intf z_intf-# define uIntf z_uIntf-# define uLongf z_uLongf-# define voidpf z_voidpf-# define voidp z_voidp-#endif--#if defined(__MSDOS__) && !defined(MSDOS)-# define MSDOS-#endif-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)-# define OS2-#endif-#if defined(_WINDOWS) && !defined(WINDOWS)-# define WINDOWS-#endif-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)-# ifndef WIN32-# define WIN32-# endif-#endif-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)-# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)-# ifndef SYS16BIT-# define SYS16BIT-# endif-# endif-#endif--/*- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more- * than 64k bytes at a time (needed on systems with 16-bit int).- */-#ifdef SYS16BIT-# define MAXSEG_64K-#endif-#ifdef MSDOS-# define UNALIGNED_OK-#endif--#ifdef __STDC_VERSION__-# ifndef STDC-# define STDC-# endif-# if __STDC_VERSION__ >= 199901L-# ifndef STDC99-# define STDC99-# endif-# endif-#endif-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))-# define STDC-#endif-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))-# define STDC-#endif-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))-# define STDC-#endif-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))-# define STDC-#endif--#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */-# define STDC-#endif--#ifndef STDC-# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */-# define const /* note: need a more gentle solution here */-# endif-#endif--/* Some Mac compilers merge all .h files incorrectly: */-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)-# define NO_DUMMY_DECL-#endif--/* Maximum value for memLevel in deflateInit2 */-#ifndef MAX_MEM_LEVEL-# ifdef MAXSEG_64K-# define MAX_MEM_LEVEL 8-# else-# define MAX_MEM_LEVEL 9-# endif-#endif--/* Maximum value for windowBits in deflateInit2 and inflateInit2.- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files- * created by gzip. (Files created by minigzip can still be extracted by- * gzip.)- */-#ifndef MAX_WBITS-# define MAX_WBITS 15 /* 32K LZ77 window */-#endif--/* The memory requirements for deflate are (in bytes):- (1 << (windowBits+2)) + (1 << (memLevel+9))- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)- plus a few kilobytes for small objects. For example, if you want to reduce- the default memory requirements from 256K to 128K, compile with- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"- Of course this will generally degrade compression (there's no free lunch).-- The memory requirements for inflate are (in bytes) 1 << windowBits- that is, 32K for windowBits=15 (default value) plus a few kilobytes- for small objects.-*/-- /* Type declarations */--#ifndef OF /* function prototypes */-# ifdef STDC-# define OF(args) args-# else-# define OF(args) ()-# endif-#endif--/* The following definitions for FAR are needed only for MSDOS mixed- * model programming (small or medium model with some far allocations).- * This was tested only with MSC; for other MSDOS compilers you may have- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,- * just define FAR to be empty.- */-#ifdef SYS16BIT-# if defined(M_I86SM) || defined(M_I86MM)- /* MSC small or medium model */-# define SMALL_MEDIUM-# ifdef _MSC_VER-# define FAR _far-# else-# define FAR far-# endif-# endif-# if (defined(__SMALL__) || defined(__MEDIUM__))- /* Turbo C small or medium model */-# define SMALL_MEDIUM-# ifdef __BORLANDC__-# define FAR _far-# else-# define FAR far-# endif-# endif-#endif--#if defined(WINDOWS) || defined(WIN32)- /* If building or using zlib as a DLL, define ZLIB_DLL.- * This is not mandatory, but it offers a little performance increase.- */-# ifdef ZLIB_DLL-# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))-# ifdef ZLIB_INTERNAL-# define ZEXTERN extern __declspec(dllexport)-# else-# define ZEXTERN extern __declspec(dllimport)-# endif-# endif-# endif /* ZLIB_DLL */- /* If building or using zlib with the WINAPI/WINAPIV calling convention,- * define ZLIB_WINAPI.- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.- */-# ifdef ZLIB_WINAPI-# ifdef FAR-# undef FAR-# endif-# include <windows.h>- /* No need for _export, use ZLIB.DEF instead. */- /* For complete Windows compatibility, use WINAPI, not __stdcall. */-# define ZEXPORT WINAPI-# ifdef WIN32-# define ZEXPORTVA WINAPIV-# else-# define ZEXPORTVA FAR CDECL-# endif-# endif-#endif--#if defined (__BEOS__)-# ifdef ZLIB_DLL-# ifdef ZLIB_INTERNAL-# define ZEXPORT __declspec(dllexport)-# define ZEXPORTVA __declspec(dllexport)-# else-# define ZEXPORT __declspec(dllimport)-# define ZEXPORTVA __declspec(dllimport)-# endif-# endif-#endif--#ifndef ZEXTERN-# define ZEXTERN extern-#endif-#ifndef ZEXPORT-# define ZEXPORT-#endif-#ifndef ZEXPORTVA-# define ZEXPORTVA-#endif--#ifndef FAR-# define FAR-#endif--#if !defined(__MACTYPES__)-typedef unsigned char Byte; /* 8 bits */-#endif-typedef unsigned int uInt; /* 16 bits or more */-typedef unsigned long uLong; /* 32 bits or more */--#ifdef SMALL_MEDIUM- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */-# define Bytef Byte FAR-#else- typedef Byte FAR Bytef;-#endif-typedef char FAR charf;-typedef int FAR intf;-typedef uInt FAR uIntf;-typedef uLong FAR uLongf;--#ifdef STDC- typedef void const *voidpc;- typedef void FAR *voidpf;- typedef void *voidp;-#else- typedef Byte const *voidpc;- typedef Byte FAR *voidpf;- typedef Byte *voidp;-#endif--#if 1 /* HAVE_UNISTD_H -- this line is updated by ./configure */-# include <sys/types.h> /* for off_t */-# include <unistd.h> /* for SEEK_* and off_t */-# ifdef VMS-# include <unixio.h> /* for off_t */-# endif-# define z_off_t off_t-#endif-#ifndef SEEK_SET-# define SEEK_SET 0 /* Seek from beginning of file. */-# define SEEK_CUR 1 /* Seek from current position. */-# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */-#endif-#ifndef z_off_t-# define z_off_t long-#endif--#if defined(__OS400__)-# define NO_vsnprintf-#endif--#if defined(__MVS__)-# define NO_vsnprintf-# ifdef FAR-# undef FAR-# endif-#endif--/* MVS linker does not support external names larger than 8 bytes */-#if defined(__MVS__)-# pragma map(deflateInit_,"DEIN")-# pragma map(deflateInit2_,"DEIN2")-# pragma map(deflateEnd,"DEEND")-# pragma map(deflateBound,"DEBND")-# pragma map(inflateInit_,"ININ")-# pragma map(inflateInit2_,"ININ2")-# pragma map(inflateEnd,"INEND")-# pragma map(inflateSync,"INSY")-# pragma map(inflateSetDictionary,"INSEDI")-# pragma map(compressBound,"CMBND")-# pragma map(inflate_table,"INTABL")-# pragma map(inflate_fast,"INFA")-# pragma map(inflate_copyright,"INCOPY")-#endif--#endif /* ZCONF_H */
− cbits/zutil.h
@@ -1,269 +0,0 @@-/* zutil.h -- internal interface and configuration of the compression library- * Copyright (C) 1995-2005 Jean-loup Gailly.- * For conditions of distribution and use, see copyright notice in zlib.h- */--/* WARNING: this file should *not* be used by applications. It is- part of the implementation of the compression library and is- subject to change. Applications should only use zlib.h.- */--/* @(#) $Id$ */--#ifndef ZUTIL_H-#define ZUTIL_H--#define ZLIB_INTERNAL-#include "zlib.h"--#ifdef STDC-# ifndef _WIN32_WCE-# include <stddef.h>-# endif-# include <string.h>-# include <stdlib.h>-#endif-#ifdef NO_ERRNO_H-# ifdef _WIN32_WCE- /* The Microsoft C Run-Time Library for Windows CE doesn't have- * errno. We define it as a global variable to simplify porting.- * Its value is always 0 and should not be used. We rename it to- * avoid conflict with other libraries that use the same workaround.- */-# define errno z_errno-# endif- extern int errno;-#else-# ifndef _WIN32_WCE-# include <errno.h>-# endif-#endif--#ifndef local-# define local static-#endif-/* compile with -Dlocal if your debugger can't find static symbols */--typedef unsigned char uch;-typedef uch FAR uchf;-typedef unsigned short ush;-typedef ush FAR ushf;-typedef unsigned long ulg;--extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */-/* (size given to avoid silly warnings with Visual C++) */--#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]--#define ERR_RETURN(strm,err) \- return (strm->msg = (char*)ERR_MSG(err), (err))-/* To be used only when the state is known to be valid */-- /* common constants */--#ifndef DEF_WBITS-# define DEF_WBITS MAX_WBITS-#endif-/* default windowBits for decompression. MAX_WBITS is for compression only */--#if MAX_MEM_LEVEL >= 8-# define DEF_MEM_LEVEL 8-#else-# define DEF_MEM_LEVEL MAX_MEM_LEVEL-#endif-/* default memLevel */--#define STORED_BLOCK 0-#define STATIC_TREES 1-#define DYN_TREES 2-/* The three kinds of block type */--#define MIN_MATCH 3-#define MAX_MATCH 258-/* The minimum and maximum match lengths */--#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */-- /* target dependencies */--#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))-# define OS_CODE 0x00-# if defined(__TURBOC__) || defined(__BORLANDC__)-# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))- /* Allow compilation with ANSI keywords only enabled */- void _Cdecl farfree( void *block );- void *_Cdecl farmalloc( unsigned long nbytes );-# else-# include <alloc.h>-# endif-# else /* MSC or DJGPP */-# include <malloc.h>-# endif-#endif--#ifdef AMIGA-# define OS_CODE 0x01-#endif--#if defined(VAXC) || defined(VMS)-# define OS_CODE 0x02-# define F_OPEN(name, mode) \- fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")-#endif--#if defined(ATARI) || defined(atarist)-# define OS_CODE 0x05-#endif--#ifdef OS2-# define OS_CODE 0x06-# ifdef M_I86- #include <malloc.h>-# endif-#endif--#if defined(MACOS) || defined(TARGET_OS_MAC)-# define OS_CODE 0x07-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os-# include <unix.h> /* for fdopen */-# else-# ifndef fdopen-# define fdopen(fd,mode) NULL /* No fdopen() */-# endif-# endif-#endif--#ifdef TOPS20-# define OS_CODE 0x0a-#endif--#ifdef WIN32-# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */-# define OS_CODE 0x0b-# endif-#endif--#ifdef __50SERIES /* Prime/PRIMOS */-# define OS_CODE 0x0f-#endif--#if defined(_BEOS_) || defined(RISCOS)-# define fdopen(fd,mode) NULL /* No fdopen() */-#endif--#if (defined(_MSC_VER) && (_MSC_VER > 600))-# if defined(_WIN32_WCE)-# define fdopen(fd,mode) NULL /* No fdopen() */-# ifndef _PTRDIFF_T_DEFINED- typedef int ptrdiff_t;-# define _PTRDIFF_T_DEFINED-# endif-# else-# define fdopen(fd,type) _fdopen(fd,type)-# endif-#endif-- /* common defaults */--#ifndef OS_CODE-# define OS_CODE 0x03 /* assume Unix */-#endif--#ifndef F_OPEN-# define F_OPEN(name, mode) fopen((name), (mode))-#endif-- /* functions */--#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)-# ifndef HAVE_VSNPRINTF-# define HAVE_VSNPRINTF-# endif-#endif-#if defined(__CYGWIN__)-# ifndef HAVE_VSNPRINTF-# define HAVE_VSNPRINTF-# endif-#endif-#ifndef HAVE_VSNPRINTF-# ifdef MSDOS- /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),- but for now we just assume it doesn't. */-# define NO_vsnprintf-# endif-# ifdef __TURBOC__-# define NO_vsnprintf-# endif-# ifdef WIN32- /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */-# if !defined(vsnprintf) && !defined(NO_vsnprintf)-# define vsnprintf _vsnprintf-# endif-# endif-# ifdef __SASC-# define NO_vsnprintf-# endif-#endif-#ifdef VMS-# define NO_vsnprintf-#endif--#if defined(pyr)-# define NO_MEMCPY-#endif-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)- /* Use our own functions for small and medium model with MSC <= 5.0.- * You may have to use the same strategy for Borland C (untested).- * The __SC__ check is for Symantec.- */-# define NO_MEMCPY-#endif-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)-# define HAVE_MEMCPY-#endif-#ifdef HAVE_MEMCPY-# ifdef SMALL_MEDIUM /* MSDOS small or medium model */-# define zmemcpy _fmemcpy-# define zmemcmp _fmemcmp-# define zmemzero(dest, len) _fmemset(dest, 0, len)-# else-# define zmemcpy memcpy-# define zmemcmp memcmp-# define zmemzero(dest, len) memset(dest, 0, len)-# endif-#else- extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));- extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));- extern void zmemzero OF((Bytef* dest, uInt len));-#endif--/* Diagnostic functions */-#ifdef DEBUG-# include <stdio.h>- extern int z_verbose;- extern void z_error OF((char *m));-# define Assert(cond,msg) {if(!(cond)) z_error(msg);}-# define Trace(x) {if (z_verbose>=0) fprintf x ;}-# define Tracev(x) {if (z_verbose>0) fprintf x ;}-# define Tracevv(x) {if (z_verbose>1) fprintf x ;}-# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}-# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}-#else-# define Assert(cond,msg)-# define Trace(x)-# define Tracev(x)-# define Tracevv(x)-# define Tracec(c,x)-# define Tracecv(c,x)-#endif---voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));-void zcfree OF((voidpf opaque, voidpf ptr));--#define ZALLOC(strm, items, size) \- (*((strm)->zalloc))((strm)->opaque, (items), (size))-#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}--#endif /* ZUTIL_H */
digest.cabal view
@@ -1,5 +1,5 @@ name: digest-version: 0.0.0.3+version: 0.0.0.4 copyright: (c) 2008 Eugene Kirpichov license: BSD3 license-file: LICENSE@@ -29,11 +29,11 @@ cpp-options: -DBYTESTRING_IN_BASE else build-depends: base < 2.0 || >= 2.2, bytestring >= 0.9- includes: zlib.h zutil.h zconf.h+ includes: zlib.h ghc-options: -Wall if !os(windows) extra-libraries: z else c-sources: cbits/adler32.c cbits/crc32.c include-dirs: cbits- install-includes: zlib.h zconf.h zutil.h+ install-includes: zlib.h