cpython-lru_cache-weakref: Modules/zlibmodule.c annotate

annotate Modules/zlibmodule.c @ 17581:c1937faabb23 2.1

Added support for optional explanation parameter to the \versionadded macro. Refactored do_cmd_versionadded() and do_cmd_versionchanged() to do most of the work in a helper function, with the do_cmd_*() wrappers just supplying a portion of the replacement text.

author	Fred Drake <fdrake@acm.org>
date	Wed, 18 Apr 2001 17:29:14 +0000
parents	9f86cba4766b
children	091c01d07d98

rev	line source
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1 /* zlibmodule.c -- gzip-compatible data compression */
16368 c696a52c2621 Fix [ Bug #129293 ] zlib library used for binary win32 distribution can crash Mark Hammond <mhammond@skippinet.com.au> parents: 15098 diff changeset	2 /* See http://www.info-zip.org/pub/infozip/zlib/ */
c696a52c2621 Fix [ Bug #129293 ] zlib library used for binary win32 distribution can crash Mark Hammond <mhammond@skippinet.com.au> parents: 15098 diff changeset	3
16369 c04ca6cba1e3 Docs for new Windows zlib build procedure. Tim Peters <tim.peters@gmail.com> parents: 16368 diff changeset	4 /* Windows users: read Python's PCbuild\readme.txt */
16368 c696a52c2621 Fix [ Bug #129293 ] zlib library used for binary win32 distribution can crash Mark Hammond <mhammond@skippinet.com.au> parents: 15098 diff changeset	5
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	6
5723 beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	7 #include "Python.h"
beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	8 #include "zlib.h"
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	9
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	10 /* The following parameters are copied from zutil.h, version 0.95 */
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	11 #define DEFLATED 8
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	12 #if MAX_MEM_LEVEL >= 8
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	13 # define DEF_MEM_LEVEL 8
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	14 #else
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	15 # define DEF_MEM_LEVEL MAX_MEM_LEVEL
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	16 #endif
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	17 #define DEF_WBITS MAX_WBITS
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	18
10538 ccee3c28b7ef Patch by Andrew Kuchling to unflush() (flush() for deflating). Guido van Rossum <guido@python.org> parents: 10467 diff changeset	19 /* The output buffer will be increased in chunks of DEFAULTALLOC bytes. */
ccee3c28b7ef Patch by Andrew Kuchling to unflush() (flush() for deflating). Guido van Rossum <guido@python.org> parents: 10467 diff changeset	20 #define DEFAULTALLOC (16*1024)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	21 #define PyInit_zlib initzlib
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	22
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	23 staticforward PyTypeObject Comptype;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	24 staticforward PyTypeObject Decomptype;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	25
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	26 static PyObject *ZlibError;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	27
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	28 typedef struct
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	29 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	30 PyObject_HEAD
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	31 z_stream zst;
10467 255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	32 PyObject *unused_data;
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	33 int is_initialised;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	34 } compobject;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	35
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	36 static char compressobj__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	37 "compressobj() -- Return a compressor object.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	38 "compressobj(level) -- Return a compressor object, using the given compression level.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	39 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	40
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	41 static char decompressobj__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	42 "decompressobj() -- Return a decompressor object.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	43 "decompressobj(wbits) -- Return a decompressor object, setting the window buffer size to wbits.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	44 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	45
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	46 static compobject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	47 newcompobject(PyTypeObject *type)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	48 {
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	49 compobject *self;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12255 diff changeset	50 self = PyObject_New(compobject, type);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	51 if (self == NULL)
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	52 return NULL;
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	53 self->is_initialised = 0;
10467 255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	54 self->unused_data = PyString_FromString("");
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	55 return self;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	56 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	57
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	58 static char compress__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	59 "compress(string) -- Compress string using the default compression level, "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	60 "returning a string containing compressed data.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	61 "compress(string, level) -- Compress string, using the chosen compression "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	62 "level (from 1 to 9). Return a string containing the compressed data.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	63 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	64
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	65 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	66 PyZlib_compress(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	67 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	68 PyObject *ReturnVal;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	69 Byte input, output;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	70 int length, level=Z_DEFAULT_COMPRESSION, err;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	71 z_stream zst;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	72
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	73 if (!PyArg_ParseTuple(args, "s#\|i:compress", &input, &length, &level))
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	74 return NULL;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	75 zst.avail_out = length + length/1000 + 12 + 1;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	76 output=(Byte*)malloc(zst.avail_out);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	77 if (output==NULL)
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	78 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	79 PyErr_SetString(PyExc_MemoryError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	80 "Can't allocate memory to compress data");
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	81 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	82 }
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	83
9662 9ba7f50b825a replace missing zalloc initialization (test_zlib now runs Jeremy Hylton <jeremy@alum.mit.edu> parents: 9661 diff changeset	84 zst.zalloc=(alloc_func)NULL;
5723 beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	85 zst.zfree=(free_func)Z_NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	86 zst.next_out=(Byte *)output;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	87 zst.next_in =(Byte *)input;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	88 zst.avail_in=length;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	89 err=deflateInit(&zst, level);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	90 switch(err)
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	91 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	92 case(Z_OK):
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	93 break;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	94 case(Z_MEM_ERROR):
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	95 PyErr_SetString(PyExc_MemoryError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	96 "Out of memory while compressing data");
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	97 free(output);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	98 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	99 case(Z_STREAM_ERROR):
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	100 PyErr_SetString(ZlibError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	101 "Bad compression level");
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	102 free(output);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	103 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	104 default:
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	105 {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	106 if (zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	107 PyErr_Format(ZlibError, "Error %i while compressing data",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	108 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	109 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	110 PyErr_Format(ZlibError, "Error %i while compressing data: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	111 err, zst.msg);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	112 deflateEnd(&zst);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	113 free(output);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	114 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	115 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	116 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	117
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	118 err=deflate(&zst, Z_FINISH);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	119 switch(err)
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	120 {
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	121 case(Z_STREAM_END):
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	122 break;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	123 /* Are there other errors to be trapped here? */
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	124 default:
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	125 {
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	126 if (zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	127 PyErr_Format(ZlibError, "Error %i while compressing data",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	128 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	129 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	130 PyErr_Format(ZlibError, "Error %i while compressing data: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	131 err, zst.msg);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	132 deflateEnd(&zst);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	133 free(output);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	134 return NULL;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	135 }
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	136 }
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	137 err=deflateEnd(&zst);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	138 if (err!=Z_OK)
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	139 {
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	140 if (zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	141 PyErr_Format(ZlibError, "Error %i while finishing compression",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	142 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	143 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	144 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	145 "Error %i while finishing compression: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	146 err, zst.msg);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	147 free(output);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	148 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	149 }
5723 beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	150 ReturnVal=PyString_FromStringAndSize((char *)output, zst.total_out);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	151 free(output);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	152 return ReturnVal;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	153 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	154
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	155 static char decompress__doc__[] =
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	156 "decompress(string) -- Decompress the data in string, returning a string containing the decompressed data.\n"
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	157 "decompress(string, wbits) -- Decompress the data in string with a window buffer size of wbits.\n"
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	158 "decompress(string, wbits, bufsize) -- Decompress the data in string with a window buffer size of wbits and an initial output buffer size of bufsize.\n"
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	159 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	160
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	161 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	162 PyZlib_decompress(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	163 {
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	164 PyObject *result_str;
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	165 Byte *input;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	166 int length, err;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	167 int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	168 z_stream zst;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	169 if (!PyArg_ParseTuple(args, "s#\|ii:decompress", &input, &length, &wsize, &r_strlen))
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	170 return NULL;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	171
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	172 if (r_strlen <= 0)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	173 r_strlen = 1;
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	174
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	175 zst.avail_in=length;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	176 zst.avail_out=r_strlen;
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	177 if (!(result_str = PyString_FromStringAndSize(NULL, r_strlen)))
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	178 {
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	179 PyErr_SetString(PyExc_MemoryError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	180 "Can't allocate memory to decompress data");
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	181 return NULL;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	182 }
5723 beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	183 zst.zalloc=(alloc_func)NULL;
beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	184 zst.zfree=(free_func)Z_NULL;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	185 zst.next_out=(Byte *)PyString_AsString(result_str);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	186 zst.next_in =(Byte *)input;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	187 err=inflateInit2(&zst, wsize);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	188 switch(err)
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	189 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	190 case(Z_OK):
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	191 break;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	192 case(Z_MEM_ERROR):
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	193 PyErr_SetString(PyExc_MemoryError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	194 "Out of memory while decompressing data");
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	195 Py_DECREF(result_str);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	196 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	197 default:
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	198 {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	199 if (zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	200 PyErr_Format(ZlibError, "Error %i preparing to decompress data",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	201 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	202 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	203 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	204 "Error %i while preparing to decompress data: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	205 err, zst.msg);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	206 inflateEnd(&zst);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	207 Py_DECREF(result_str);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	208 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	209 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	210 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	211 do
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	212 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	213 err=inflate(&zst, Z_FINISH);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	214 switch(err)
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	215 {
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	216 case(Z_STREAM_END):
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	217 break;
8128 fdba6397b729 Tiny patch for zlib 1.1.2 Guido van Rossum <guido@python.org> parents: 6911 diff changeset	218 case(Z_BUF_ERROR):
15098 7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	219 /*
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	220 * If there is at least 1 byte of room according to zst.avail_out
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	221 * and we get this error, assume that it means zlib cannot
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	222 * process the inflate call() due to an error in the data.
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	223 */
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	224 if (zst.avail_out > 0)
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	225 {
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	226 PyErr_Format(ZlibError, "Error %i while decompressing data",
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	227 err);
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	228 inflateEnd(&zst);
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	229 Py_DECREF(result_str);
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	230 return NULL;
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	231 }
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	232 /* fall through */
7de0808f1fe3 Patch #101810: check whether zst.avail_out is non-zero when getting Andrew M. Kuchling <amk@amk.ca> parents: 13816 diff changeset	233 case(Z_OK):
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	234 /* need more memory */
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	235 if (_PyString_Resize(&result_str, r_strlen << 1) == -1)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	236 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	237 PyErr_SetString(PyExc_MemoryError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	238 "Out of memory while decompressing data");
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	239 inflateEnd(&zst);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	240 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	241 }
6094 a22fca7a5c5a Casts by Jack to shut up the Mac compiler. Guido van Rossum <guido@python.org> parents: 6042 diff changeset	242 zst.next_out = (unsigned char *)PyString_AsString(result_str) + r_strlen;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	243 zst.avail_out=r_strlen;
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	244 r_strlen = r_strlen << 1;
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	245 break;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	246 default:
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	247 {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	248 if (zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	249 PyErr_Format(ZlibError, "Error %i while decompressing data",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	250 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	251 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	252 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	253 "Error %i while decompressing data: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	254 err, zst.msg);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	255 inflateEnd(&zst);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	256 Py_DECREF(result_str);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	257 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	258 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	259 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	260 } while(err!=Z_STREAM_END);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	261
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	262 err=inflateEnd(&zst);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	263 if (err!=Z_OK)
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	264 {
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	265 if (zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	266 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	267 "Error %i while finishing data decompression",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	268 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	269 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	270 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	271 "Error %i while finishing data decompression: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	272 err, zst.msg);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	273 Py_DECREF(result_str);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	274 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	275 }
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	276 _PyString_Resize(&result_str, zst.total_out);
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	277 return result_str;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	278 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	279
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	280 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	281 PyZlib_compressobj(PyObject selfptr, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	282 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	283 compobject *self;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	284 int level=Z_DEFAULT_COMPRESSION, method=DEFLATED;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	285 int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	286
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	287 if (!PyArg_ParseTuple(args, "\|iiiii:compressobj", &level, &method, &wbits,
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	288 &memLevel, &strategy))
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	289 return NULL;
9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	290
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	291 self = newcompobject(&Comptype);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	292 if (self==NULL) return(NULL);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	293 self->zst.zalloc = (alloc_func)NULL;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	294 self->zst.zfree = (free_func)Z_NULL;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	295 err = deflateInit2(&self->zst, level, method, wbits, memLevel, strategy);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	296 switch(err)
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	297 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	298 case (Z_OK):
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	299 self->is_initialised = 1;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	300 return (PyObject*)self;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	301 case (Z_MEM_ERROR):
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	302 Py_DECREF(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	303 PyErr_SetString(PyExc_MemoryError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	304 "Can't allocate memory for compression object");
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	305 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	306 case(Z_STREAM_ERROR):
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	307 Py_DECREF(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	308 PyErr_SetString(PyExc_ValueError,
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	309 "Invalid initialization option");
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	310 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	311 default:
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	312 {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	313 if (self->zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	314 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	315 "Error %i while creating compression object",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	316 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	317 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	318 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	319 "Error %i while creating compression object: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	320 err, self->zst.msg);
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	321 Py_DECREF(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	322 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	323 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	324 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	325 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	326
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	327 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	328 PyZlib_decompressobj(PyObject selfptr, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	329 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	330 int wbits=DEF_WBITS, err;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	331 compobject *self;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	332 if (!PyArg_ParseTuple(args, "\|i:decompressobj", &wbits))
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	333 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	334 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	335 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	336 self=newcompobject(&Decomptype);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	337 if (self==NULL) return(NULL);
5723 beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	338 self->zst.zalloc=(alloc_func)NULL;
beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	339 self->zst.zfree=(free_func)Z_NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	340 err=inflateInit2(&self->zst, wbits);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	341 switch(err)
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	342 {
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	343 case (Z_OK):
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	344 self->is_initialised = 1;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	345 return (PyObject*)self;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	346 case(Z_STREAM_ERROR):
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	347 Py_DECREF(self);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	348 PyErr_SetString(PyExc_ValueError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	349 "Invalid initialization option");
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	350 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	351 case (Z_MEM_ERROR):
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	352 Py_DECREF(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	353 PyErr_SetString(PyExc_MemoryError,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	354 "Can't allocate memory for decompression object");
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	355 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	356 default:
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	357 {
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	358 if (self->zst.msg == Z_NULL)
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	359 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	360 "Error %i while creating decompression object",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	361 err);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	362 else
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	363 PyErr_Format(ZlibError,
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	364 "Error %i while creating decompression object: %.200s",
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	365 err, self->zst.msg);
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	366 Py_DECREF(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	367 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	368 }
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	369 }
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	370 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	371
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	372 static void
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	373 Comp_dealloc(compobject *self)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	374 {
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	375 if (self->is_initialised)
167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	376 deflateEnd(&self->zst);
10467 255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	377 Py_XDECREF(self->unused_data);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12255 diff changeset	378 PyObject_Del(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	379 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	380
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	381 static void
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	382 Decomp_dealloc(compobject *self)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	383 {
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	384 if (self->is_initialised)
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	385 inflateEnd(&self->zst);
10467 255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	386 Py_XDECREF(self->unused_data);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12255 diff changeset	387 PyObject_Del(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	388 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	389
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	390 static char comp_compress__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	391 "compress(data) -- Return a string containing a compressed version of the data.\n\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	392 "After calling this function, some of the input data may still\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	393 "be stored in internal buffers for later processing.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	394 "Call the flush() method to clear these buffers."
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	395 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	396
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	397
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	398 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	399 PyZlib_objcompress(compobject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	400 {
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	401 int err, inplen, length = DEFAULTALLOC;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	402 PyObject *RetVal;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	403 Byte *input;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	404 unsigned long start_total_out;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	405
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	406 if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen))
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	407 return NULL;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	408 if (!(RetVal = PyString_FromStringAndSize(NULL, length))) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	409 PyErr_SetString(PyExc_MemoryError,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	410 "Can't allocate memory to compress data");
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	411 return NULL;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	412 }
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	413 start_total_out = self->zst.total_out;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	414 self->zst.avail_in = inplen;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	415 self->zst.next_in = input;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	416 self->zst.avail_out = length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	417 self->zst.next_out = (unsigned char *)PyString_AsString(RetVal);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	418 err = deflate(&(self->zst), Z_NO_FLUSH);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	419 /* while Z_OK and the output buffer is full, there might be more output,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	420 so extend the output buffer and try again */
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	421 while (err == Z_OK && self->zst.avail_out == 0) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	422 if (_PyString_Resize(&RetVal, length << 1) == -1) {
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	423 PyErr_SetString(PyExc_MemoryError,
6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	424 "Can't allocate memory to compress data");
6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	425 return NULL;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	426 }
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	427 self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	428 self->zst.avail_out = length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	429 length = length << 1;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	430 err = deflate(&(self->zst), Z_NO_FLUSH);
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	431 }
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	432 /* We will only get Z_BUF_ERROR if the output buffer was full but there
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	433 wasn't more output when we tried again, so it is not an error condition */
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	434 if (err != Z_OK && err != Z_BUF_ERROR) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	435 if (self->zst.msg == Z_NULL)
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	436 PyErr_Format(ZlibError, "Error %i while compressing",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	437 err);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	438 else
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	439 PyErr_Format(ZlibError, "Error %i while compressing: %.200s",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	440 err, self->zst.msg);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	441 Py_DECREF(RetVal);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	442 return NULL;
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	443 }
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	444 _PyString_Resize(&RetVal, self->zst.total_out - start_total_out);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	445 return RetVal;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	446 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	447
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	448 static char decomp_decompress__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	449 "decompress(data) -- Return a string containing the decompressed version of the data.\n\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	450 "After calling this function, some of the input data may still\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	451 "be stored in internal buffers for later processing.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	452 "Call the flush() method to clear these buffers."
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	453 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	454
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	455 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	456 PyZlib_objdecompress(compobject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	457 {
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	458 int err, inplen, length = DEFAULTALLOC;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	459 PyObject *RetVal;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	460 Byte *input;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	461 unsigned long start_total_out;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	462
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	463 if (!PyArg_ParseTuple(args, "s#:decompress", &input, &inplen))
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	464 return NULL;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	465 if (!(RetVal = PyString_FromStringAndSize(NULL, length))) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	466 PyErr_SetString(PyExc_MemoryError,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	467 "Can't allocate memory to compress data");
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	468 return NULL;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	469 }
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	470 start_total_out = self->zst.total_out;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	471 self->zst.avail_in = inplen;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	472 self->zst.next_in = input;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	473 self->zst.avail_out = length;
6094 a22fca7a5c5a Casts by Jack to shut up the Mac compiler. Guido van Rossum <guido@python.org> parents: 6042 diff changeset	474 self->zst.next_out = (unsigned char *)PyString_AsString(RetVal);
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	475 err = inflate(&(self->zst), Z_SYNC_FLUSH);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	476 /* while Z_OK and the output buffer is full, there might be more output,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	477 so extend the output buffer and try again */
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	478 while (err == Z_OK && self->zst.avail_out == 0) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	479 if (_PyString_Resize(&RetVal, length << 1) == -1) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	480 PyErr_SetString(PyExc_MemoryError,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	481 "Can't allocate memory to compress data");
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	482 return NULL;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	483 }
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	484 self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	485 self->zst.avail_out = length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	486 length = length << 1;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	487 err = inflate(&(self->zst), Z_SYNC_FLUSH);
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	488 }
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	489 /* The end of the compressed data has been reached, so set the unused_data
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	490 attribute to a string containing the remainder of the data in the string.
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	491 Note that this is also a logical place to call inflateEnd, but the old
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	492 behaviour of only calling it on flush() is preserved.*/
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	493 if (err == Z_STREAM_END) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	494 Py_XDECREF(self->unused_data); /* Free the original, empty string */
16735 9f86cba4766b Patch #103926: fix two warnings from Tru64's compiler Andrew M. Kuchling <amk@amk.ca> parents: 16718 diff changeset	495 self->unused_data = PyString_FromStringAndSize((char *)self->zst.next_in,
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	496 self->zst.avail_in);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	497 if (self->unused_data == NULL) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	498 PyErr_SetString(PyExc_MemoryError,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	499 "Can't allocate memory to unused_data");
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	500 Py_DECREF(RetVal);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	501 return NULL;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	502 }
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	503 /* We will only get Z_BUF_ERROR if the output buffer was full but there
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	504 wasn't more output when we tried again, so it is not an error condition */
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	505 } else if (err != Z_OK && err != Z_BUF_ERROR) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	506 if (self->zst.msg == Z_NULL)
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	507 PyErr_Format(ZlibError, "Error %i while decompressing",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	508 err);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	509 else
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	510 PyErr_Format(ZlibError, "Error %i while decompressing: %.200s",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	511 err, self->zst.msg);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	512 Py_DECREF(RetVal);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	513 return NULL;
10467 255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	514 }
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	515 _PyString_Resize(&RetVal, self->zst.total_out - start_total_out);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	516 return RetVal;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	517 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	518
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	519 static char comp_flush__doc__[] =
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	520 "flush( [mode] ) -- Return a string containing any remaining compressed data.\n"
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	521 "mode can be one of the constants Z_SYNC_FLUSH, Z_FULL_FLUSH, Z_FINISH; the \n"
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	522 "default value used when mode is not specified is Z_FINISH.\n"
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	523 "If mode == Z_FINISH, the compressor object can no longer be used after\n"
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	524 "calling the flush() method. Otherwise, more data can still be compressed.\n"
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	525 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	526
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	527 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	528 PyZlib_flush(compobject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	529 {
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	530 int err, length=DEFAULTALLOC;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	531 PyObject *RetVal;
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	532 int flushmode = Z_FINISH;
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	533 unsigned long start_total_out;
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	534
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	535 if (!PyArg_ParseTuple(args, "\|i:flush", &flushmode))
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	536 return NULL;
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	537
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	538 /* Flushing with Z_NO_FLUSH is a no-op, so there's no point in
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	539 doing any work at all; just return an empty string. */
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	540 if (flushmode == Z_NO_FLUSH) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	541 return PyString_FromStringAndSize(NULL, 0);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	542 }
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	543
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	544 if (!(RetVal = PyString_FromStringAndSize(NULL, length))) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	545 PyErr_SetString(PyExc_MemoryError,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	546 "Can't allocate memory to compress data");
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	547 return NULL;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	548 }
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	549 start_total_out = self->zst.total_out;
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	550 self->zst.avail_in = 0;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	551 self->zst.avail_out = length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	552 self->zst.next_out = (unsigned char *)PyString_AsString(RetVal);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	553 err = deflate(&(self->zst), flushmode);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	554 /* while Z_OK and the output buffer is full, there might be more output,
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	555 so extend the output buffer and try again */
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	556 while (err == Z_OK && self->zst.avail_out == 0) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	557 if (_PyString_Resize(&RetVal, length << 1) == -1) {
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	558 PyErr_SetString(PyExc_MemoryError,
6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	559 "Can't allocate memory to compress data");
6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	560 return NULL;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	561 }
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	562 self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	563 self->zst.avail_out = length;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	564 length = length << 1;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	565 err = deflate(&(self->zst), flushmode);
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	566 }
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	567 /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	568 various data structures. Note we should only get Z_STREAM_END when
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	569 flushmode is Z_FINISH, but checking both for safety*/
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	570 if (err == Z_STREAM_END && flushmode == Z_FINISH) {
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	571 err=deflateEnd(&(self->zst));
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	572 if (err!=Z_OK) {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	573 if (self->zst.msg == Z_NULL)
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	574 PyErr_Format(ZlibError, "Error %i from deflateEnd()",
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	575 err);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	576 else
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	577 PyErr_Format(ZlibError,"Error %i from deflateEnd(): %.200s",
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	578 err, self->zst.msg);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	579 Py_DECREF(RetVal);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	580 return NULL;
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	581 }
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	582 self->is_initialised = 0;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	583 /* We will only get Z_BUF_ERROR if the output buffer was full but there
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	584 wasn't more output when we tried again, so it is not an error condition */
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	585 } else if (err!=Z_OK && err!=Z_BUF_ERROR) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	586 if (self->zst.msg == Z_NULL)
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	587 PyErr_Format(ZlibError, "Error %i while flushing",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	588 err);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	589 else
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	590 PyErr_Format(ZlibError, "Error %i while flushing: %.200s",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	591 err, self->zst.msg);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	592 Py_DECREF(RetVal);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	593 return NULL;
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	594 }
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	595 _PyString_Resize(&RetVal, self->zst.total_out - start_total_out);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	596 return RetVal;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	597 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	598
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	599 static char decomp_flush__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	600 "flush() -- Return a string containing any remaining decompressed data. "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	601 "The decompressor object can no longer be used after this call."
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	602 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	603
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	604 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	605 PyZlib_unflush(compobject self, PyObject args)
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	606 /*decompressor flush is a no-op because all pending data would have been
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	607 flushed by the decompress method. However, this routine previously called
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	608 inflateEnd, causing any further decompress or flush calls to raise
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	609 exceptions. This behaviour has been preserved.*/
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	610 {
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	611 int err;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	612
13816 afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	613 if (!PyArg_ParseTuple(args, ""))
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	614 return NULL;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	615 err=inflateEnd(&(self->zst));
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	616 if (err!=Z_OK) {
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	617 if (self->zst.msg == Z_NULL)
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	618 PyErr_Format(ZlibError, "Error %i from inflateEnd()",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	619 err);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	620 else
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	621 PyErr_Format(ZlibError, "Error %i from inflateEnd(): %.200s",
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	622 err, self->zst.msg);
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	623 return NULL;
6042 6db3d52d4a78 Several bug fixes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6007 diff changeset	624 }
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	625 self->is_initialised = 0;
01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	626 return PyString_FromStringAndSize(NULL, 0);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	627 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	628
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	629 static PyMethodDef comp_methods[] =
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	630 {
13816 afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	631 {"compress", (binaryfunc)PyZlib_objcompress,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	632 METH_VARARGS, comp_compress__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	633 {"flush", (binaryfunc)PyZlib_flush,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	634 METH_VARARGS, comp_flush__doc__},
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	635 {NULL, NULL}
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	636 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	637
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	638 static PyMethodDef Decomp_methods[] =
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	639 {
13816 afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	640 {"decompress", (binaryfunc)PyZlib_objdecompress,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	641 METH_VARARGS, decomp_decompress__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	642 {"flush", (binaryfunc)PyZlib_unflush,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	643 METH_VARARGS, decomp_flush__doc__},
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	644 {NULL, NULL}
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	645 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	646
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	647 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	648 Comp_getattr(compobject self, char name)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	649 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	650 return Py_FindMethod(comp_methods, (PyObject *)self, name);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	651 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	652
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	653 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	654 Decomp_getattr(compobject self, char name)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	655 {
10467 255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	656 if (strcmp(name, "unused_data") == 0)
255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	657 {
255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	658 Py_INCREF(self->unused_data);
255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	659 return self->unused_data;
255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	660 }
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	661 return Py_FindMethod(Decomp_methods, (PyObject *)self, name);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	662 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	663
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	664 static char adler32__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	665 "adler32(string) -- Compute an Adler-32 checksum of string, using "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	666 "a default starting value, and returning an integer value.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	667 "adler32(string, value) -- Compute an Adler-32 checksum of string, using "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	668 "the starting value provided, and returning an integer value\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	669 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	670
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	671 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	672 PyZlib_adler32(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	673 {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	674 uLong adler32val=adler32(0L, Z_NULL, 0);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	675 Byte *buf;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	676 int len;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	677
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	678 if (!PyArg_ParseTuple(args, "s#\|l:adler32", &buf, &len, &adler32val))
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	679 {
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	680 return NULL;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	681 }
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	682 adler32val = adler32(adler32val, buf, len);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	683 return PyInt_FromLong(adler32val);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	684 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	685
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	686 static char crc32__doc__[] =
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	687 "crc32(string) -- Compute a CRC-32 checksum of string, using "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	688 "a default starting value, and returning an integer value.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	689 "crc32(string, value) -- Compute a CRC-32 checksum of string, using "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	690 "the starting value provided, and returning an integer value.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	691 ;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	692
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	693 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	694 PyZlib_crc32(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	695 {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	696 uLong crc32val=crc32(0L, Z_NULL, 0);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	697 Byte *buf;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	698 int len;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11619 diff changeset	699 if (!PyArg_ParseTuple(args, "s#\|l:crc32", &buf, &len, &crc32val))
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	700 {
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	701 return NULL;
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	702 }
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	703 crc32val = crc32(crc32val, buf, len);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	704 return PyInt_FromLong(crc32val);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	705 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	706
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	707
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	708 static PyMethodDef zlib_methods[] =
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	709 {
13816 afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	710 {"adler32", (PyCFunction)PyZlib_adler32,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	711 METH_VARARGS, adler32__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	712 {"compress", (PyCFunction)PyZlib_compress,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	713 METH_VARARGS, compress__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	714 {"compressobj", (PyCFunction)PyZlib_compressobj,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	715 METH_VARARGS, compressobj__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	716 {"crc32", (PyCFunction)PyZlib_crc32,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	717 METH_VARARGS, crc32__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	718 {"decompress", (PyCFunction)PyZlib_decompress,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	719 METH_VARARGS, decompress__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	720 {"decompressobj", (PyCFunction)PyZlib_decompressobj,
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	721 METH_VARARGS, decompressobj__doc__},
afbbe674d58a Use METH_VARARGS instead of numeric constant 1 Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	722 {NULL, NULL}
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	723 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	724
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	725 statichere PyTypeObject Comptype = {
6911 2c49c02cf747 Win32 treatment. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	726 PyObject_HEAD_INIT(0)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	727 0,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	728 "Compress",
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	729 sizeof(compobject),
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	730 0,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	731 (destructor)Comp_dealloc, /tp_dealloc/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	732 0, /tp_print/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	733 (getattrfunc)Comp_getattr, /tp_getattr/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	734 0, /tp_setattr/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	735 0, /tp_compare/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	736 0, /tp_repr/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	737 0, /tp_as_number/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	738 0, /tp_as_sequence/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	739 0, /tp_as_mapping/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	740 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	741
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	742 statichere PyTypeObject Decomptype = {
6911 2c49c02cf747 Win32 treatment. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	743 PyObject_HEAD_INIT(0)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	744 0,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	745 "Decompress",
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	746 sizeof(compobject),
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	747 0,
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	748 (destructor)Decomp_dealloc, /tp_dealloc/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	749 0, /tp_print/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	750 (getattrfunc)Decomp_getattr, /tp_getattr/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	751 0, /tp_setattr/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	752 0, /tp_compare/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	753 0, /tp_repr/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	754 0, /tp_as_number/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	755 0, /tp_as_sequence/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	756 0, /tp_as_mapping/
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	757 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	758
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	759 /* The following insint() routine was blatantly ripped off from
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	760 socketmodule.c */
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	761
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	762 /* Convenience routine to export an integer value.
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	763 For simplicity, errors (which are unlikely anyway) are ignored. */
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	764 static void
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	765 insint(PyObject d, char name, int value)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	766 {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	767 PyObject *v = PyInt_FromLong((long) value);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	768 if (v == NULL) {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	769 /* Don't bother reporting this error */
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	770 PyErr_Clear();
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	771 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	772 else {
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	773 PyDict_SetItemString(d, name, v);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	774 Py_DECREF(v);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	775 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	776 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	777
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	778 static char zlib_module_documentation[]=
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	779 "The functions in this module allow compression and decompression "
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	780 "using the zlib library, which is based on GNU zip. \n\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	781 "adler32(string) -- Compute an Adler-32 checksum.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	782 "adler32(string, start) -- Compute an Adler-32 checksum using a given starting value.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	783 "compress(string) -- Compress a string.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	784 "compress(string, level) -- Compress a string with the given level of compression (1--9).\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	785 "compressobj([level]) -- Return a compressor object.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	786 "crc32(string) -- Compute a CRC-32 checksum.\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	787 "crc32(string, start) -- Compute a CRC-32 checksum using a given starting value.\n"
11607 69216c11a1bd Fix typo in docstring: wbites -> wbits Andrew M. Kuchling <amk@amk.ca> parents: 10571 diff changeset	788 "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n"
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	789 "decompressobj([wbits]) -- Return a decompressor object (wbits=window buffer size).\n\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	790 "Compressor objects support compress() and flush() methods; decompressor \n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	791 "objects support decompress() and flush()."
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	792 ;
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	793
9588 38023a425e48 Add DL_EXPORT() to all modules that could possibly be used Guido van Rossum <guido@python.org> parents: 8636 diff changeset	794 DL_EXPORT(void)
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13496 diff changeset	795 PyInit_zlib(void)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	796 {
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	797 PyObject m, d, *ver;
6911 2c49c02cf747 Win32 treatment. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	798 Comptype.ob_type = &PyType_Type;
2c49c02cf747 Win32 treatment. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	799 Decomptype.ob_type = &PyType_Type;
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	800 m = Py_InitModule4("zlib", zlib_methods,
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	801 zlib_module_documentation,
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	802 (PyObject*)NULL,PYTHON_API_VERSION);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	803 d = PyModule_GetDict(m);
6367 2c29b8982643 Apply two changes, systematically: Guido van Rossum <guido@python.org> parents: 6236 diff changeset	804 ZlibError = PyErr_NewException("zlib.error", NULL, NULL);
11619 91245dc940eb For ZlibError and ZLIB_VERSION, only attempt to add entry to the Fred Drake <fdrake@acm.org> parents: 11607 diff changeset	805 if (ZlibError != NULL)
91245dc940eb For ZlibError and ZLIB_VERSION, only attempt to add entry to the Fred Drake <fdrake@acm.org> parents: 11607 diff changeset	806 PyDict_SetItemString(d, "error", ZlibError);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	807
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	808 insint(d, "MAX_WBITS", MAX_WBITS);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	809 insint(d, "DEFLATED", DEFLATED);
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	810 insint(d, "DEF_MEM_LEVEL", DEF_MEM_LEVEL);
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	811 insint(d, "Z_BEST_SPEED", Z_BEST_SPEED);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	812 insint(d, "Z_BEST_COMPRESSION", Z_BEST_COMPRESSION);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	813 insint(d, "Z_DEFAULT_COMPRESSION", Z_DEFAULT_COMPRESSION);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	814 insint(d, "Z_FILTERED", Z_FILTERED);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	815 insint(d, "Z_HUFFMAN_ONLY", Z_HUFFMAN_ONLY);
6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	816 insint(d, "Z_DEFAULT_STRATEGY", Z_DEFAULT_STRATEGY);
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	817
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	818 insint(d, "Z_FINISH", Z_FINISH);
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	819 insint(d, "Z_NO_FLUSH", Z_NO_FLUSH);
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	820 insint(d, "Z_SYNC_FLUSH", Z_SYNC_FLUSH);
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	821 insint(d, "Z_FULL_FLUSH", Z_FULL_FLUSH);
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	822
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	823 ver = PyString_FromString(ZLIB_VERSION);
11619 91245dc940eb For ZlibError and ZLIB_VERSION, only attempt to add entry to the Fred Drake <fdrake@acm.org> parents: 11607 diff changeset	824 if (ver != NULL) {
91245dc940eb For ZlibError and ZLIB_VERSION, only attempt to add entry to the Fred Drake <fdrake@acm.org> parents: 11607 diff changeset	825 PyDict_SetItemString(d, "ZLIB_VERSION", ver);
91245dc940eb For ZlibError and ZLIB_VERSION, only attempt to add entry to the Fred Drake <fdrake@acm.org> parents: 11607 diff changeset	826 Py_DECREF(ver);
91245dc940eb For ZlibError and ZLIB_VERSION, only attempt to add entry to the Fred Drake <fdrake@acm.org> parents: 11607 diff changeset	827 }
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	828 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/zlibmodule.c @ 17581:c1937faabb23 2.1