- initialize local zvals used as HashTable containers

[m6w6/ext-http] / missing.c

diff --git a/missing.c b/missing.c
index 7f9fcd8771b71b58eeea9058e8585cef148838d4..9d9b9412cf8ad31bd54251e10c9b969bb324b454 100644 (file)
--- a/missing.c
+++ b/missing.c
@@ -18,16 +18,10 @@
 #include "php.h"
 #include "missing.h"
 
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
+#ifdef WONKY
 int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC)
 {
-       zval *property;
-
-       if (ce->type & ZEND_INTERNAL_CLASS) {
-               property = malloc(sizeof(zval));
-       } else {
-               ALLOC_ZVAL(property);
-       }
+       zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS);
        INIT_PZVAL(property);
        ZVAL_DOUBLE(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
@@ -35,37 +29,33 @@ int zend_declare_property_double(zend_class_entry *ce, char *name, int name_leng
 
 void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC)
 {
-       zval *tmp;
-
-       ALLOC_ZVAL(tmp);
-       tmp->is_ref = 0;
-       tmp->refcount = 0;
+       zval *tmp = ecalloc(1, sizeof(zval));
        ZVAL_DOUBLE(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
 
 int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC)
 {
-       zval *property;
-
-       if (ce->type & ZEND_INTERNAL_CLASS) {
-               property = malloc(sizeof(zval));
-       } else {
-               ALLOC_ZVAL(property);
-       }
+       zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS);
        INIT_PZVAL(property);
        ZVAL_BOOL(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC)
+{      zval *tmp = ecalloc(1, sizeof(zval));
+       ZVAL_BOOL(tmp, value);
+       zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
+}
+
+void zend_update_property_stringl(zend_class_entry *scope, zval *object, char *name, int name_length, char *value, int value_len TSRMLS_DC)
 {
        zval *tmp;
-
+       
        ALLOC_ZVAL(tmp);
        tmp->is_ref = 0;
        tmp->refcount = 0;
-       ZVAL_BOOL(tmp, value);
+       ZVAL_STRINGL(tmp, value, value_len, 1);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }