cvs: php4 /ext/zlib php_zlib.h zlib.c zlib_fopen_wrapper.c

wez Fri Mar 15 20:37:24 2002 EDT Modified files: /php4/ext/zlib php_zlib.h zlib.c zlib_fopen_wrapper.c Log: change * formatting Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.22 php4/ext/zlib/php_zlib.h:1.23 --- php4/ext/zlib/php_zlib.h:1.22 Fri Mar 15 16:03:05 2002 +++ php4/ext/zlib/php_zlib.h Fri Mar 15 20:37:24 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zlib.h,v 1.22 2002/03/15 21:03:05 wez Exp $ */ +/* $Id: php_zlib.h,v 1.23 2002/03/16 01:37:24 wez Exp $ */ #ifndef PHP_ZLIB_H #define PHP_ZLIB_H @@ -67,7 +67,7 @@ FILE *zlib_fopen_wrapper(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC); int php_enable_output_compression(int buffer_size TSRMLS_DC); -php_stream * php_stream_gzopen(char * path, char * mode, int options, char ** opened_path TSRMLS_DC); +php_stream *php_stream_gzopen(char *path, char *mode, int options, char **opened_path TSRMLS_DC); extern php_stream_ops php_stream_gzio_ops; extern php_stream_wrapper php_stream_gzip_wrapper; Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.109 php4/ext/zlib/zlib.c:1.110 --- php4/ext/zlib/zlib.c:1.109 Fri Mar 15 16:03:05 2002 +++ php4/ext/zlib/zlib.c Fri Mar 15 20:37:24 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.109 2002/03/15 21:03:05 wez Exp $ */ +/* $Id: zlib.c,v 1.110 2002/03/16 01:37:24 wez Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -252,7 +252,7 @@ */ static gzFile php_gzopen_wrapper(char *path, char *mode, int options TSRMLS_DC) { - php_stream * stream = NULL; + php_stream *stream = NULL; int fd; stream = php_stream_open_wrapper(path, mode, options | REPORT_ERRORS, NULL TSRMLS_CC); @@ -280,7 +280,7 @@ char *slashed, buf[8192]; register int i=0; int use_include_path = 0; - php_stream * stream; + php_stream *stream; /* check args */ switch (ZEND_NUM_ARGS()) { Index: php4/ext/zlib/zlib_fopen_wrapper.c diff -u php4/ext/zlib/zlib_fopen_wrapper.c:1.10 php4/ext/zlib/zlib_fopen_wrapper.c:1.11 --- php4/ext/zlib/zlib_fopen_wrapper.c:1.10 Fri Mar 15 16:03:06 2002 +++ php4/ext/zlib/zlib_fopen_wrapper.c Fri Mar 15 20:37:24 2002 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib_fopen_wrapper.c,v 1.10 2002/03/15 21:03:06 wez Exp $ */ +/* $Id: zlib_fopen_wrapper.c,v 1.11 2002/03/16 01:37:24 wez Exp $ */ #define IS_EXT_MODULE #define _GNU_SOURCE @@ -25,12 +25,12 @@ struct php_gz_stream_data_t { gzFile gz_file; - php_stream * stream; + php_stream *stream; }; -static size_t php_gziop_read(php_stream * stream, char * buf, size_t count) +static size_t php_gziop_read(php_stream *stream, char *buf, size_t count) { - struct php_gz_stream_data_t * self = (struct php_gz_stream_data_t *)stream->abstract; + struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *)stream->abstract; if (buf == NULL && count == 0) { if (gzeof(self->gz_file)) @@ -41,28 +41,28 @@ return gzread(self->gz_file, buf, count); } -static char * php_gziop_gets(php_stream * stream, char * buf, size_t size) +static char *php_gziop_gets(php_stream *stream, char *buf, size_t size) { - struct php_gz_stream_data_t * self = (struct php_gz_stream_data_t *)stream->abstract; + struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *)stream->abstract; return gzgets(self->gz_file, buf, size); } -static size_t php_gziop_write(php_stream * stream, const char * buf, size_t count) +static size_t php_gziop_write(php_stream *stream, const char *buf, size_t count) { - struct php_gz_stream_data_t * self = (struct php_gz_stream_data_t *)stream->abstract; + struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *)stream->abstract; return gzwrite(self->gz_file, (char*)buf, count); } -static int php_gziop_seek(php_stream * stream, off_t offset, int whence) +static int php_gziop_seek(php_stream *stream, off_t offset, int whence) { - struct php_gz_stream_data_t * self = (struct php_gz_stream_data_t *)stream->abstract; + struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *)stream->abstract; return gzseek(self->gz_file, offset, whence); } -static int php_gziop_close(php_stream * stream) +static int php_gziop_close(php_stream *stream) { - struct php_gz_stream_data_t * self = (struct php_gz_stream_data_t *)stream->abstract; + struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *)stream->abstract; int ret; ret = gzclose(self->gz_file); @@ -79,10 +79,10 @@ NULL, "ZLIB" }; -php_stream * php_stream_gzopen(char * path, char * mode, int options, char ** opened_path TSRMLS_DC) +php_stream *php_stream_gzopen(char *path, char *mode, int options, char **opened_path TSRMLS_DC) { - struct php_gz_stream_data_t * self; - php_stream * stream = NULL; + struct php_gz_stream_data_t *self; + php_stream *stream = NULL; self = emalloc(sizeof(*self));