cvs: php-src(PHP_5_2) /main/streams filter.c
| From: | Antony Dovgal | Date: | Mon, 15 Jan 2007 16:03:43 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /main/streams filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42734@lists.php.net to get a copy of this message | ||
tony2001 Mon Jan 15 16:03:43 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams filter.c
Log:
revert the patch temporarily, I need to test a bigger patch in HEAD..
http://cvs.php.net/viewvc.cgi/php-src/main/streams/filter.c?r1=1.17.2.3.2.7&r2=1.17.2.3.2.8&diff_format=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.17.2.3.2.7 php-src/main/streams/filter.c:1.17.2.3.2.8
--- php-src/main/streams/filter.c:1.17.2.3.2.7 Mon Jan 15 14:59:49 2007
+++ php-src/main/streams/filter.c Mon Jan 15 16:03:42 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.17.2.3.2.7 2007/01/15 14:59:49 tony2001 Exp $ */
+/* $Id: filter.c,v 1.17.2.3.2.8 2007/01/15 16:03:42 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -46,12 +46,12 @@
/* API for registering GLOBAL filters */
PHPAPI int php_stream_filter_register_factory(const char *filterpattern, php_stream_filter_factory
*factory TSRMLS_DC)
{
- return zend_hash_add(&stream_filters_hash, (char*)filterpattern, strlen(filterpattern) + 1,
factory, sizeof(*factory), NULL);
+ return zend_hash_add(&stream_filters_hash, (char*)filterpattern, strlen(filterpattern),
factory, sizeof(*factory), NULL);
}
PHPAPI int php_stream_filter_unregister_factory(const char *filterpattern TSRMLS_DC)
{
- return zend_hash_del(&stream_filters_hash, (char*)filterpattern, strlen(filterpattern) + 1);
+ return zend_hash_del(&stream_filters_hash, (char*)filterpattern, strlen(filterpattern));
}
/* API for registering VOLATILE wrappers */
@@ -65,7 +65,7 @@
zend_hash_copy(FG(stream_filters), &stream_filters_hash, NULL, &tmpfactory,
sizeof(php_stream_filter_factory));
}
- return zend_hash_add(FG(stream_filters), (char*)filterpattern, strlen(filterpattern) + 1, factory,
sizeof(*factory), NULL);
+ return zend_hash_add(FG(stream_filters), (char*)filterpattern, strlen(filterpattern), factory,
sizeof(*factory), NULL);
}
/* Buckets */
@@ -259,7 +259,7 @@
n = strlen(filtername);
- if (SUCCESS == zend_hash_find(filter_hash, (char*)filtername, n + 1, (void**)&factory)) {
+ if (SUCCESS == zend_hash_find(filter_hash, (char*)filtername, n, (void**)&factory)) {
filter = factory->create_filter(filtername, filterparams, persistent TSRMLS_CC);
} else if ((period = strrchr(filtername, '.'))) {
/* try a wildcard */
@@ -271,7 +271,7 @@
while (period && !filter) {
*period = '\0';
strcat(wildname, ".*");
- if (SUCCESS == zend_hash_find(filter_hash, wildname, strlen(wildname) + 1,
(void**)&factory)) {
+ if (SUCCESS == zend_hash_find(filter_hash, wildname, strlen(wildname), (void**)&factory)) {
filter = factory->create_filter(filtername, filterparams, persistent TSRMLS_CC);
}