com php-src: catch up with stream datatypes: ext/bz2/bz2_ filter.c ext/iconv/iconv.c ext/mcrypt/mcrypt_filter .c ext/standard/filters.c
ext/standard/user_filters .c ext/zlib/zlib_filter.c main/streams/filter.c m ain/streams/php_stream_filter_api.h

From: Date: Wed, 05 Oct 2016 20:53:21 +0000
Subject: com php-src: catch up with stream datatypes: ext/bz2/bz2_ filter.c ext/iconv/iconv.c ext/mcrypt/mcrypt_filter .c ext/standard/filters.c
ext/standard/user_filters .c ext/zlib/zlib_filter.c main/streams/filter.c m ain/streams/php_stream_filter_api.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94842@lists.php.net to get a copy of this message
Commit: 42b7912f039461cfe0139ff72b2f8181de4e45bc Author: Anatol Belski <ab@php.net> Thu, 15 Sep 2016 17:50:05 +0200 Parents: 02acb056b3b5895521121a869357ce1195a5863d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=42b7912f039461cfe0139ff72b2f8181de4e45bc Log: catch up with stream datatypes Changed paths: M ext/bz2/bz2_filter.c M ext/iconv/iconv.c M ext/mcrypt/mcrypt_filter.c M ext/standard/filters.c M ext/standard/user_filters.c M ext/zlib/zlib_filter.c M main/streams/filter.c M main/streams/php_stream_filter_api.h

diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c index 2211549..6a21dd3 100644 --- a/ext/bz2/bz2_filter.c +++ b/ext/bz2/bz2_filter.c @@ -307,7 +307,7 @@ static php_stream_filter_ops php_bz2_compress_ops = { /* {{{ bzip2.* common factory */ -static php_stream_filter *php_bz2_filter_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *php_bz2_filter_create(const char *filtername, zval *filterparams, uint8_t persistent) { php_stream_filter_ops *fops = NULL; php_bz2_filter_data *data; diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index ab51dd0..528e981 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -2869,7 +2869,7 @@ static php_stream_filter_ops php_iconv_stream_filter_ops = { }; /* {{{ php_iconv_stream_filter_create */ -static php_stream_filter *php_iconv_stream_filter_factory_create(const char *name, zval *params, int persistent) +static php_stream_filter *php_iconv_stream_filter_factory_create(const char *name, zval *params, uint8_t persistent) { php_stream_filter *retval = NULL; php_iconv_stream_filter *inst; diff --git a/ext/mcrypt/mcrypt_filter.c b/ext/mcrypt/mcrypt_filter.c index fc5aefb..23ed098 100644 --- a/ext/mcrypt/mcrypt_filter.c +++ b/ext/mcrypt/mcrypt_filter.c @@ -149,7 +149,7 @@ static php_stream_filter_ops php_mcrypt_filter_ops = { /* {{{ php_mcrypt_filter_create * Instantiate mcrypt filter */ -static php_stream_filter *php_mcrypt_filter_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *php_mcrypt_filter_create(const char *filtername, zval *filterparams, uint8_t persistent) { int encrypt = 1, iv_len, key_len, keyl, result; const char *cipher = filtername + sizeof("mcrypt.") - 1; diff --git a/ext/standard/filters.c b/ext/standard/filters.c index 70f0629..cf26cea 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -67,7 +67,7 @@ static php_stream_filter_ops strfilter_rot13_ops = { "string.rot13" }; -static php_stream_filter *strfilter_rot13_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *strfilter_rot13_create(const char *filtername, zval *filterparams, uint8_t persistent) { return php_stream_filter_alloc(&strfilter_rot13_ops, NULL, persistent); } @@ -149,12 +149,12 @@ static php_stream_filter_ops strfilter_tolower_ops = { "string.tolower" }; -static php_stream_filter *strfilter_toupper_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *strfilter_toupper_create(const char *filtername, zval *filterparams, uint8_t persistent) { return php_stream_filter_alloc(&strfilter_toupper_ops, NULL, persistent); } -static php_stream_filter *strfilter_tolower_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *strfilter_tolower_create(const char *filtername, zval *filterparams, uint8_t persistent) { return php_stream_filter_alloc(&strfilter_tolower_ops, NULL, persistent); } @@ -172,8 +172,8 @@ static php_stream_filter_factory strfilter_tolower_factory = { typedef struct _php_strip_tags_filter { const char *allowed_tags; int allowed_tags_len; - int state; - int persistent; + uint8_t state; + uint8_t persistent; } php_strip_tags_filter; static int php_strip_tags_filter_ctor(php_strip_tags_filter *inst, const char *allowed_tags, size_t allowed_tags_len, int persistent) @@ -244,7 +244,7 @@ static php_stream_filter_ops strfilter_strip_tags_ops = { "string.strip_tags" }; -static php_stream_filter *strfilter_strip_tags_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *strfilter_strip_tags_create(const char *filtername, zval *filterparams, uint8_t persistent) { php_strip_tags_filter *inst; smart_str tags_ss = {0}; @@ -1724,7 +1724,7 @@ static php_stream_filter_ops strfilter_convert_ops = { "convert.*" }; -static php_stream_filter *strfilter_convert_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *strfilter_convert_create(const char *filtername, zval *filterparams, uint8_t persistent) { php_convert_filter *inst; php_stream_filter *retval = NULL; @@ -1778,7 +1778,7 @@ static php_stream_filter_factory strfilter_convert_factory = { typedef struct _php_consumed_filter_data { size_t consumed; zend_off_t offset; - int persistent; + uint8_t persistent; } php_consumed_filter_data; static php_stream_filter_status_t consumed_filter_filter( @@ -1827,7 +1827,7 @@ static php_stream_filter_ops consumed_filter_ops = { "consumed" }; -static php_stream_filter *consumed_filter_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *consumed_filter_create(const char *filtername, zval *filterparams, uint8_t persistent) { php_stream_filter_ops *fops = NULL; php_consumed_filter_data *data; @@ -2035,7 +2035,7 @@ static php_stream_filter_ops chunked_filter_ops = { "dechunk" }; -static php_stream_filter *chunked_filter_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *chunked_filter_create(const char *filtername, zval *filterparams, uint8_t persistent) { php_stream_filter_ops *fops = NULL; php_chunked_filter_data *data; diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 5ca6e0b..9342cb0 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -261,7 +261,7 @@ static php_stream_filter_ops userfilter_ops = { }; static php_stream_filter *user_filter_factory_create(const char *filtername, - zval *filterparams, int persistent) + zval *filterparams, uint8_t persistent) { struct php_user_filter_data *fdat = NULL; php_stream_filter *filter; diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 4018e25..e48c5d6 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -286,7 +286,7 @@ static php_stream_filter_ops php_zlib_deflate_ops = { /* {{{ zlib.* common factory */ -static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *filterparams, uint8_t persistent) { php_stream_filter_ops *fops = NULL; php_zlib_filter_data *data; diff --git a/main/streams/filter.c b/main/streams/filter.c index c921d4c..71b06aa 100644 --- a/main/streams/filter.c +++ b/main/streams/filter.c @@ -247,7 +247,7 @@ PHPAPI void php_stream_bucket_unlink(php_stream_bucket *bucket) * match. If that fails, we try "convert.charset.*", then "convert.*" * This means that we don't need to clog up the hashtable with a zillion * charsets (for example) but still be able to provide them all as filters */ -PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval *filterparams, int persistent) +PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval *filterparams, uint8_t persistent) { HashTable *filter_hash = (FG(stream_filters) ? FG(stream_filters) : &stream_filters_hash); php_stream_filter_factory *factory = NULL; @@ -290,7 +290,7 @@ PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval return filter; } -PHPAPI php_stream_filter *_php_stream_filter_alloc(php_stream_filter_ops *fops, void *abstract, int persistent STREAMS_DC) +PHPAPI php_stream_filter *_php_stream_filter_alloc(php_stream_filter_ops *fops, void *abstract, uint8_t persistent STREAMS_DC) { php_stream_filter *filter; diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h index a0118da..ff96fd8 100644 --- a/main/streams/php_stream_filter_api.h +++ b/main/streams/php_stream_filter_api.h @@ -131,7 +131,7 @@ PHPAPI int php_stream_filter_append_ex(php_stream_filter_chain *chain, php_strea PHPAPI int _php_stream_filter_flush(php_stream_filter *filter, int finish); PHPAPI php_stream_filter *php_stream_filter_remove(php_stream_filter *filter, int call_dtor); PHPAPI void php_stream_filter_free(php_stream_filter *filter); -PHPAPI php_stream_filter *_php_stream_filter_alloc(php_stream_filter_ops *fops, void *abstract, int persistent STREAMS_DC); +PHPAPI php_stream_filter *_php_stream_filter_alloc(php_stream_filter_ops *fops, void *abstract, uint8_t persistent STREAMS_DC); END_EXTERN_C() #define php_stream_filter_alloc(fops, thisptr, persistent) _php_stream_filter_alloc((fops), (thisptr), (persistent) STREAMS_CC) #define php_stream_filter_alloc_rel(fops, thisptr, persistent) _php_stream_filter_alloc((fops), (thisptr), (persistent) STREAMS_REL_CC) @@ -142,14 +142,14 @@ END_EXTERN_C() #define php_stream_is_filtered(stream) ((stream)->readfilters.head || (stream)->writefilters.head) typedef struct _php_stream_filter_factory { - php_stream_filter *(*create_filter)(const char *filtername, zval *filterparams, int persistent); + php_stream_filter *(*create_filter)(const char *filtername, zval *filterparams, uint8_t persistent); } php_stream_filter_factory; BEGIN_EXTERN_C() PHPAPI int php_stream_filter_register_factory(const char *filterpattern, php_stream_filter_factory *factory); PHPAPI int php_stream_filter_unregister_factory(const char *filterpattern); PHPAPI int php_stream_filter_register_factory_volatile(const char *filterpattern, php_stream_filter_factory *factory); -PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval *filterparams, int persistent); +PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval *filterparams, uint8_t persistent); END_EXTERN_C() /*
« previous php.cvs (#94842) next »