cvs: php4 /ext/bz2 bz2.c

sniper Thu Mar 15 17:21:24 2001 EDT Modified files: /php4/ext/bz2 bz2.c Log: Make this extension compile again.. Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.10 php4/ext/bz2/bz2.c:1.11 --- php4/ext/bz2/bz2.c:1.10 Wed Mar 14 23:03:28 2001 +++ php4/ext/bz2/bz2.c Thu Mar 15 17:21:24 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.10 2001/03/15 07:03:28 sterling Exp $ */ +/* $Id: bz2.c,v 1.11 2001/03/16 01:21:24 sniper Exp $ */ #include "php.h" @@ -216,16 +216,15 @@ Close a BZip2 stream */ PHP_FUNCTION(bzclose) { - zval **bzp; /* BZip2 Resource Pointer */ - BZFILE *bz; /* BZip2 File pointer */ + zval **bzp=NULL; /* BZip2 Resource Pointer */ + BZFILE *bz; /* BZip2 File pointer */ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &bzp) == FAILURE) { WRONG_PARAM_COUNT; } ZEND_FETCH_RESOURCE(bz, BZFILE *, bzp, -1, "BZip2 File Handle", le_bz2); - - zend_list_delete(Z_LVAL_PP(Bz)); + zend_list_delete(Z_RESVAL_PP(bzp)); } /* }}} */ @@ -328,7 +327,7 @@ { zval **source, /* Source data to decompress */ **zsmall; /* (Optional) user specified small */ - char *dest = emalloc(PHP_BZ_DECOMPRESS_SIZE), /* Destination buffer, initially allocated */ + char *dest = emalloc(PHP_BZ_DECOMPRESS_SIZE); /* Destination buffer, initially allocated */ int error, /* Error container */ iter = 1, /* Iteration count for the compression loop */ size, /* Current size to realloc the dest buffer to */