X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.c;h=584a75c4c137492eff307429a0770edc562217cb;hp=aefbdb9f08674d59571b7600e9015f6cb17baff8;hb=39feb7a7e30bb4b393a6f76aa2f35d4e9275523e;hpb=791714f8fbc8e92970711321a3fd99331df566f1

diff --git a/missing.c b/missing.c
index aefbdb9..584a75c 100644
--- 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,24 +29,14 @@ 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);
@@ -60,72 +44,24 @@ int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length
 
 void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC)
 {
-	zval *tmp;
+	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);
 }
 
 #endif
 
-static inline zval *new_class_constant_zval(zend_class_entry *ce)
-{
-	zval *z;
-	if (ce->type & ZEND_INTERNAL_CLASS) {
-		z = malloc(sizeof(zval));
-	} else {
-		ALLOC_ZVAL(z);
-	}
-	INIT_PZVAL(z);
-	return z;
-}
-
-int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC)
-{
-	return zend_hash_add(&ce->constants_table, name, name_length, &value, sizeof(zval *), NULL);
-}
-
-int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC)
-{
-	zval *constant = new_class_constant_zval(ce);
-	ZVAL_LONG(constant, value);
-	return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
-}
-
-int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, size_t name_length, zend_bool value TSRMLS_DC)
-{
-	zval *constant = new_class_constant_zval(ce);
-	ZVAL_BOOL(constant, value);
-	return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
-}
-
-int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC)
-{
-	zval *constant = new_class_constant_zval(ce);
-	ZVAL_DOUBLE(constant, value);
-	return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
-}
-
-int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t name_length, char *value TSRMLS_DC)
-{
-	return zend_declare_class_constant_stringl(ce, name, name_length, value, strlen(value) TSRMLS_CC);
-}
-
-int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC)
-{
-	zval *constant = new_class_constant_zval(ce);
-	Z_TYPE_P(constant) = IS_STRING;
-	Z_STRLEN_P(constant) = value_length;
-	Z_STRVAL_P(constant) = malloc(value_length + 1);
-	memcpy(Z_STRVAL_P(constant), value, value_length);
-	Z_STRVAL_P(constant)[value_length] = '\0';
-	return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
-}
-
-
 /*
  * Local variables:
  * tab-width: 4