pollita Mon Sep 13 17:07:23 2004 EDT
Modified files:
/php-src/main/streams streams.c filter.c
Log:
Allocating hash tables should be done via macro, not directly
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.65&r2=1.66&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.65 php-src/main/streams/streams.c:1.66
--- php-src/main/streams/streams.c:1.65 Fri Sep 10 17:50:29 2004
+++ php-src/main/streams/streams.c Mon Sep 13 17:07:22 2004
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.65 2004/09/10 21:50:29 pollita Exp $ */
+/* $Id: streams.c,v 1.66 2004/09/13 21:07:22 pollita Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1414,7 +1414,7 @@
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 @@
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));
}
http://cvs.php.net/diff.php/php-src/main/streams/filter.c?r1=1.13&r2=1.14&ty=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.13 php-src/main/streams/filter.c:1.14
--- php-src/main/streams/filter.c:1.13 Mon Jun 21 17:08:05 2004
+++ php-src/main/streams/filter.c Mon Sep 13 17:07:22 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.13 2004/06/21 21:08:05 pollita Exp $ */
+/* $Id: filter.c,v 1.14 2004/09/13 21:07:22 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -60,7 +60,7 @@
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));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
