X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.c;h=65851bef9dd24d6571ffed3c666dec0230de2dae;hp=328096c8a38ef427938f10767ae74fd46dc672fd;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=5aa47bb3226e35928025f06f0b550582f69608bd diff --git a/missing.c b/missing.c index 328096c..65851be 100644 --- a/missing.c +++ b/missing.c @@ -1,33 +1,28 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2010, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #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 +30,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 +45,22 @@ 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; - - ALLOC_ZVAL(tmp); - tmp->is_ref = 0; - tmp->refcount = 0; + zval *tmp = ecalloc(1, sizeof(zval)); ZVAL_BOOL(tmp, value); zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); } -#endif - -#if (PHP_MAJOR_VERSION >= 5) - -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) +void zend_update_property_stringl(zend_class_entry *scope, zval *object, char *name, int name_length, char *value, int value_len 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); + zval *tmp; + + ALLOC_ZVAL(tmp); + tmp->is_ref = 0; + tmp->refcount = 0; + ZVAL_STRINGL(tmp, value, value_len, 1); + zend_update_property(scope, object, name, name_length, tmp 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); - if (ce->type & ZEND_INTERNAL_CLASS) { - ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0); - } else { - ZVAL_STRINGL(constant, value, value_length, 1); - } - return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); -} #endif /*