sniper Wed Mar 19 19:32:16 2003 EDT
Modified files:
/php4/ext/bz2 bz2.c
Log:
WS & CS fixes
Index: php4/ext/bz2/bz2.c
diff -u php4/ext/bz2/bz2.c:1.66 php4/ext/bz2/bz2.c:1.67
--- php4/ext/bz2/bz2.c:1.66 Thu Mar 6 18:07:22 2003
+++ php4/ext/bz2/bz2.c Wed Mar 19 19:32:16 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.66 2003/03/06 23:07:22 ddhill Exp $ */
+/* $Id: bz2.c,v 1.67 2003/03/20 00:32:16 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -47,8 +47,8 @@
PHP_FE(bzopen, NULL)
PHP_FE(bzread, NULL)
PHP_FALIAS(bzwrite, fwrite, NULL)
- PHP_FALIAS(bzflush, fflush, NULL)
- PHP_FALIAS(bzclose, fclose, NULL)
+ PHP_FALIAS(bzflush, fflush, NULL)
+ PHP_FALIAS(bzclose, fclose, NULL)
PHP_FE(bzerrno, NULL)
PHP_FE(bzerrstr, NULL)
PHP_FE(bzerror, NULL)
@@ -88,8 +88,9 @@
ret = BZ2_bzread(self->bz_file, buf, count);
- if (ret == 0)
+ if (ret == 0) {
stream->eof = 1;
+ }
return ret;
}
@@ -106,14 +107,13 @@
struct php_bz2_stream_data_t *self = (struct php_bz2_stream_data_t
*)stream->abstract;
int ret = EOF;
- if (close_handle)
+ if (close_handle) {
BZ2_bzclose(self->bz_file);
+ }
- if (self->stream)
- php_stream_free(self->stream,
- PHP_STREAM_FREE_CLOSE |
- (close_handle == 0 ?
PHP_STREAM_FREE_PRESERVE_HANDLE : 0)
- );
+ if (self->stream) {
+ php_stream_free(self->stream, PHP_STREAM_FREE_CLOSE | (close_handle ==
0 ? PHP_STREAM_FREE_PRESERVE_HANDLE : 0));
+ }
efree(self);
@@ -139,9 +139,7 @@
/* {{{ Bzip2 stream openers */
PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz,
-
char *mode,
-
php_stream *innerstream
-
STREAMS_DC TSRMLS_DC)
+
char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC)
{
struct php_bz2_stream_data_t *self;
@@ -154,19 +152,19 @@
}
PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
- char *path,
- char *mode,
- int
options,
- char
**opened_path,
-
php_stream_context *context
- STREAMS_DC
TSRMLS_DC)
+
char *path,
+
char *mode,
+
int options,
+
char **opened_path,
+
php_stream_context *context STREAMS_DC TSRMLS_DC)
{
php_stream *retstream = NULL, *stream = NULL;
char *path_copy = NULL;
BZFILE *bz_file = NULL;
- if (strncasecmp("compress.bzip2://", path, 17) == 0)
+ if (strncasecmp("compress.bzip2://", path, 17) == 0) {
path += 17;
+ }
#ifdef VIRTUAL_DIR
virtual_filepath(path, &path_copy TSRMLS_CC);
@@ -188,21 +186,24 @@
if (stream) {
int fd;
- if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD,
(void**) &fd, REPORT_ERRORS))
+ if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void
**) &fd, REPORT_ERRORS)) {
bz_file = BZ2_bzdopen(fd, mode);
+ }
}
}
if (bz_file) {
retstream = _php_stream_bz2open_from_BZFILE(bz_file, mode, stream
STREAMS_REL_CC TSRMLS_CC);
- if (retstream)
+ if (retstream) {
return retstream;
+ }
BZ2_bzclose(bz_file);
}
- if (stream)
+ if (stream) {
php_stream_close(stream);
+ }
return NULL;
}
@@ -279,11 +280,12 @@
Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;
if (PG(magic_quotes_runtime)) {
- Z_STRVAL_P(return_value) = php_addslashes(Z_STRVAL_P(return_value),
- Z_STRLEN_P(return_value), &Z_STRLEN_P(return_value), 1
TSRMLS_CC);
+ Z_STRVAL_P(return_value) = php_addslashes(
Z_STRVAL_P(return_value),
+
Z_STRLEN_P(return_value),
+
&Z_STRLEN_P(return_value), 1 TSRMLS_CC);
}
- Z_TYPE_P(return_value) = IS_STRING;
+ Z_TYPE_P(return_value) = IS_STRING;
}
/* }}} */
@@ -296,8 +298,7 @@
BZFILE *bz; /* The compressed file stream */
php_stream *stream = NULL;
- if (ZEND_NUM_ARGS() != 2 ||
- zend_get_parameters_ex(2, &file, &mode) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &file, &mode) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(mode);
@@ -308,7 +309,7 @@
stream = php_stream_bz2open(NULL,
Z_STRVAL_PP(file),
Z_STRVAL_PP(mode),
-
ENFORCE_SAFE_MODE|REPORT_ERRORS,
+
ENFORCE_SAFE_MODE | REPORT_ERRORS,
NULL);
} else {
/* If it is a resource, than its a stream resource */
@@ -316,8 +317,9 @@
php_stream_from_zval(stream, file);
- if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)&fd,
REPORT_ERRORS))
+ if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_FD, (void *) &fd,
REPORT_ERRORS)) {
RETURN_FALSE;
+ }
bz = BZ2_bzdopen(fd, Z_STRVAL_PP(mode));
@@ -373,10 +375,10 @@
argc = ZEND_NUM_ARGS();
- if (argc < 1 || argc > 3 ||
- zend_get_parameters_ex(argc, &source, &zblock_size, &zwork_factor) ==
FAILURE) {
+ if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &source,
&zblock_size, &zwork_factor) == FAILURE) {
WRONG_PARAM_COUNT;
}
+
convert_to_string_ex(source);
/* Assign them to easy to use variables, dest_len is initially the length of
the data
@@ -400,13 +402,7 @@
work_factor = Z_LVAL_PP(zwork_factor);
}
- error = BZ2_bzBuffToBuffCompress(dest,
- &dest_len,
-
Z_STRVAL_PP(source),
- source_len,
- block_size,
- 0,
- work_factor);
+ error = BZ2_bzBuffToBuffCompress(dest, &dest_len, Z_STRVAL_PP(source),
source_len, block_size, 0, work_factor);
if (error != BZ_OK) {
efree(dest);
RETURN_LONG(error);
@@ -434,10 +430,10 @@
small = 0, /* The actual small */
argc = ZEND_NUM_ARGS(); /* Argument count */
- if (argc < 1 || argc > 2 ||
- zend_get_parameters_ex(argc, &source, &zsmall) == FAILURE) {
+ if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &source, &zsmall) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
+
convert_to_string_ex(source);
/* optional small argument handling */
@@ -446,7 +442,6 @@
small = Z_LVAL_PP(zsmall);
}
-
/* Depending on the size of the source buffer, either allocate
the length of the source buffer or the a default decompression
size */
@@ -462,12 +457,7 @@
++iter;
/* Perform the decompression */
- error = BZ2_bzBuffToBuffDecompress(dest,
-
&size,
-
Z_STRVAL_PP(source),
-
Z_STRLEN_PP(source),
-
small,
- 0);
+ error = BZ2_bzBuffToBuffDecompress(dest, &size, Z_STRVAL_PP(source),
Z_STRLEN_PP(source), small, 0);
} while (error == BZ_OUTBUFF_FULL);
if (error != BZ_OK) {
@@ -493,10 +483,10 @@
int errnum; /* Error number */
struct php_bz2_stream_data_t *self;
- if (ZEND_NUM_ARGS() != 1 ||
- zend_get_parameters_ex(1, &bzp) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &bzp) == FAILURE) {
WRONG_PARAM_COUNT;
}
+
php_stream_from_zval(stream, bzp);
if (!php_stream_is(stream, PHP_STREAM_IS_BZIP2)) {
@@ -510,19 +500,18 @@
/* Determine what to return */
switch (opt) {
- case PHP_BZ_ERRNO:
- RETURN_LONG(errnum);
- break;
- case PHP_BZ_ERRSTR:
- RETURN_STRING((char*)errstr, 1);
- break;
- case PHP_BZ_ERRBOTH:
- array_init(return_value);
-
- add_assoc_long (return_value, "errno", errnum);
- add_assoc_string(return_value, "errstr", (char*)errstr, 1);
+ case PHP_BZ_ERRNO:
+ RETURN_LONG(errnum);
+ break;
+ case PHP_BZ_ERRSTR:
+ RETURN_STRING((char*)errstr, 1);
+ break;
+ case PHP_BZ_ERRBOTH:
+ array_init(return_value);
- break;
+ add_assoc_long (return_value, "errno", errnum);
+ add_assoc_string(return_value, "errstr", (char*)errstr, 1);
+ break;
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
