diff options
| author | Sara Golemon <pollita@php.net> | 2004-09-13 21:07:22 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2004-09-13 21:07:22 +0000 |
| commit | 9cd4320b65a94345a8f087f3dce2346b8f55e64c (patch) | |
| tree | 39d399f971d5a143a4d013fa233cdaf60b639394 | |
| parent | 17c77a54bf2f930049b0d706c6c196675f1cf8b1 (diff) | |
| download | php-git-9cd4320b65a94345a8f087f3dce2346b8f55e64c.tar.gz | |
Allocating hash tables should be done via macro, not directly
| -rw-r--r-- | main/streams/filter.c | 2 | ||||
| -rwxr-xr-x | main/streams/streams.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/filter.c b/main/streams/filter.c index cc6e62292f..da61c714fa 100644 --- a/main/streams/filter.c +++ b/main/streams/filter.c @@ -60,7 +60,7 @@ PHPAPI int php_stream_filter_register_factory_volatile(const char *filterpattern if (!FG(stream_filters)) { php_stream_filter_factory tmpfactory; - FG(stream_filters) = emalloc(sizeof(HashTable)); + ALLOC_HASHTABLE(FG(stream_filters)); zend_hash_init(FG(stream_filters), 0, NULL, NULL, 1); zend_hash_copy(FG(stream_filters), &stream_filters_hash, NULL, &tmpfactory, sizeof(php_stream_filter_factory)); } diff --git a/main/streams/streams.c b/main/streams/streams.c index dfe54fc550..bb2b137c32 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1414,7 +1414,7 @@ PHPAPI int php_register_url_stream_wrapper_volatile(char *protocol, php_stream_w if (!FG(stream_wrappers)) { php_stream_wrapper tmpwrapper; - FG(stream_wrappers) = emalloc(sizeof(HashTable)); + ALLOC_HASHTABLE(FG(stream_wrappers)); zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1); zend_hash_copy(FG(stream_wrappers), &url_stream_wrappers_hash, NULL, &tmpwrapper, sizeof(php_stream_wrapper)); } @@ -1427,7 +1427,7 @@ PHPAPI int php_unregister_url_stream_wrapper_volatile(char *protocol TSRMLS_DC) if (!FG(stream_wrappers)) { php_stream_wrapper tmpwrapper; - FG(stream_wrappers) = emalloc(sizeof(HashTable)); + ALLOC_HASHTABLE(FG(stream_wrappers)); zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1); zend_hash_copy(FG(stream_wrappers), &url_stream_wrappers_hash, NULL, &tmpwrapper, sizeof(php_stream_wrapper)); } |