diff options
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 1127 |
1 files changed, 532 insertions, 595 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index f81f87e4c9..31cb41adfd 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -605,7 +605,7 @@ static zend_object_handlers date_object_handlers_period; RETURN_FALSE; \ } \ } \ - obj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); \ + obj = Z_PHPDATE_P(object); \ #define DATE_CHECK_INITIALIZED(member, class_name) \ if (!(member)) { \ @@ -613,35 +613,35 @@ static zend_object_handlers date_object_handlers_period; RETURN_FALSE; \ } -static void date_object_free_storage_date(void *object TSRMLS_DC); -static void date_object_free_storage_timezone(void *object TSRMLS_DC); -static void date_object_free_storage_interval(void *object TSRMLS_DC); -static void date_object_free_storage_period(void *object TSRMLS_DC); +static void date_object_free_storage_date(zend_object *object TSRMLS_DC); +static void date_object_free_storage_timezone(zend_object *object TSRMLS_DC); +static void date_object_free_storage_interval(zend_object *object TSRMLS_DC); +static void date_object_free_storage_period(zend_object *object TSRMLS_DC); -static zend_object_value date_object_new_date(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_new_interval(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_new_period(zend_class_entry *class_type TSRMLS_DC); +static zend_object *date_object_new_date(zend_class_entry *class_type TSRMLS_DC); +static zend_object *date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC); +static zend_object *date_object_new_interval(zend_class_entry *class_type TSRMLS_DC); +static zend_object *date_object_new_period(zend_class_entry *class_type TSRMLS_DC); -static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC); -static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC); -static zend_object_value date_object_clone_interval(zval *this_ptr TSRMLS_DC); -static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC); +static zend_object *date_object_clone_date(zval *this_ptr TSRMLS_DC); +static zend_object *date_object_clone_timezone(zval *this_ptr TSRMLS_DC); +static zend_object *date_object_clone_interval(zval *this_ptr TSRMLS_DC); +static zend_object *date_object_clone_period(zval *this_ptr TSRMLS_DC); static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC); -static HashTable *date_object_get_gc(zval *object, zval ***table, int *n TSRMLS_DC); +static HashTable *date_object_get_gc(zval *object, zval **table, int *n TSRMLS_DC); static HashTable *date_object_get_properties(zval *object TSRMLS_DC); -static HashTable *date_object_get_gc_interval(zval *object, zval ***table, int *n TSRMLS_DC); +static HashTable *date_object_get_gc_interval(zval *object, zval **table, int *n TSRMLS_DC); static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC); -static HashTable *date_object_get_gc_period(zval *object, zval ***table, int *n TSRMLS_DC); +static HashTable *date_object_get_gc_period(zval *object, zval **table, int *n TSRMLS_DC); static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC); static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC); -static HashTable *date_object_get_gc_timezone(zval *object, zval ***table, int *n TSRMLS_DC); +static HashTable *date_object_get_gc_timezone(zval *object, zval **table, int *n TSRMLS_DC); -zval *date_interval_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC); -void date_interval_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC); -static zval *date_period_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC); -static void date_period_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC); +zval *date_interval_read_property(zval *object, zval *member, int type, zend_uint cache_slot, zval *rv TSRMLS_DC); +void date_interval_write_property(zval *object, zval *member, zval *value, zend_uint cache_slot TSRMLS_DC); +static zval *date_period_read_property(zval *object, zval *member, int type, zend_uint cache_slot, zval *rv TSRMLS_DC); +static void date_period_write_property(zval *object, zval *member, zval *value, zend_uint cache_slot TSRMLS_DC); /* {{{ Module struct */ zend_module_entry date_module_entry = { @@ -676,12 +676,12 @@ static PHP_GINIT_FUNCTION(date) /* }}} */ -static void _php_date_tzinfo_dtor(void *tzinfo) +static void _php_date_tzinfo_dtor(zval *zv) /* {{{ */ { - timelib_tzinfo **tzi = (timelib_tzinfo **)tzinfo; + timelib_tzinfo *tzi = (timelib_tzinfo*)Z_PTR_P(zv); - timelib_tzinfo_dtor(*tzi); -} + timelib_tzinfo_dtor(tzi); +} /* }}} */ /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(date) @@ -899,20 +899,20 @@ PHP_MINFO_FUNCTION(date) /* {{{ Timezone Cache functions */ static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, const timelib_tzdb *tzdb TSRMLS_DC) { - timelib_tzinfo *tzi, **ptzi; + timelib_tzinfo *tzi; if(!DATEG(tzcache)) { ALLOC_HASHTABLE(DATEG(tzcache)); zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor, 0); } - if (zend_hash_find(DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void **) &ptzi) == SUCCESS) { - return *ptzi; + if ((tzi = zend_hash_str_find_ptr(DATEG(tzcache), formal_tzname, strlen(formal_tzname))) != NULL) { + return tzi; } tzi = timelib_parse_tzfile(formal_tzname, tzdb); if (tzi) { - zend_hash_add(DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL); + zend_hash_str_add_ptr(DATEG(tzcache), formal_tzname, strlen(formal_tzname), tzi); } return tzi; } @@ -1051,7 +1051,7 @@ char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib_sll d) /* }}} */ /* {{{ date_format - (gm)date helper */ -static char *date_format(char *format, int format_len, timelib_time *t, int localtime) +static zend_string *date_format(char *format, int format_len, timelib_time *t, int localtime TSRMLS_DC) { smart_str string = {0}; int i, length = 0; @@ -1062,7 +1062,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca int weekYearSet = 0; if (!format_len) { - return estrdup(""); + return STR_EMPTY_ALLOC(); } if (localtime) { @@ -1206,7 +1206,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca timelib_time_offset_dtor(offset); } - return string.c; + return string.s; } static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime) @@ -1214,7 +1214,6 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime) char *format; int format_len; long ts; - char *string; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, &ts) == FAILURE) { RETURN_FALSE; @@ -1223,17 +1222,15 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime) ts = time(NULL); } - string = php_format_date(format, format_len, ts, localtime TSRMLS_CC); - - RETVAL_STRING(string, 0); + RETURN_STR(php_format_date(format, format_len, ts, localtime TSRMLS_CC)); } /* }}} */ -PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localtime TSRMLS_DC) /* {{{ */ +PHPAPI zend_string *php_format_date(char *format, int format_len, time_t ts, int localtime TSRMLS_DC) /* {{{ */ { timelib_time *t; timelib_tzinfo *tzi; - char *string; + zend_string *string; t = timelib_time_ctor(); @@ -1247,7 +1244,7 @@ PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localt timelib_unixtime2gmt(t, ts); } - string = date_format(format, format_len, t, localtime); + string = date_format(format, format_len, t, localtime TSRMLS_CC); timelib_time_dtor(t); return string; @@ -1623,7 +1620,7 @@ PHP_FUNCTION(checkdate) /* {{{ php_strftime - (gm)strftime helper */ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) { - char *format, *buf; + char *format; int format_len; long timestamp = 0; struct tm ta; @@ -1632,6 +1629,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) timelib_time *ts; timelib_tzinfo *tzi; timelib_time_offset *offset = NULL; + zend_string *buf; timestamp = (long) time(NULL); @@ -1684,10 +1682,10 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) /* VS2012 crt has a bug where strftime crash with %z and %Z format when the initial buffer is too small. See http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code */ - buf = (char *) emalloc(buf_len); - while ((real_len=strftime(buf, buf_len, format, &ta))==buf_len || real_len==0) { + buf = STR_ALLOC(buf_len, 0); + while ((real_len = strftime(buf->val, buf_len, format, &ta)) == buf_len || real_len == 0) { buf_len *= 2; - buf = (char *) erealloc(buf, buf_len); + buf = STR_REALLOC(buf, buf_len, 0); if (!--max_reallocs) { break; } @@ -1706,10 +1704,10 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) } if (real_len && real_len != buf_len) { - buf = (char *) erealloc(buf, real_len + 1); - RETURN_STRINGL(buf, real_len, 0); + buf = STR_REALLOC(buf, real_len, 0); + RETURN_STR(buf); } - efree(buf); + STR_FREE(buf); RETURN_FALSE; } /* }}} */ @@ -1814,8 +1812,8 @@ PHP_FUNCTION(getdate) add_assoc_long(return_value, "mon", ts->m); add_assoc_long(return_value, "year", ts->y); add_assoc_long(return_value, "yday", timelib_day_of_year(ts->y, ts->m, ts->d)); - add_assoc_string(return_value, "weekday", php_date_full_day_name(ts->y, ts->m, ts->d), 1); - add_assoc_string(return_value, "month", mon_full_names[ts->m - 1], 1); + add_assoc_string(return_value, "weekday", php_date_full_day_name(ts->y, ts->m, ts->d)); + add_assoc_string(return_value, "month", mon_full_names[ts->m - 1]); add_index_long(return_value, 0, timestamp); timelib_time_dtor(ts); @@ -1843,8 +1841,7 @@ PHP_FUNCTION(getdate) /* define an overloaded iterator structure */ typedef struct { zend_object_iterator intern; - zval *date_period_zval; - zval *current; + zval current; php_period_obj *object; int current_index; } date_period_it; @@ -1854,14 +1851,13 @@ static void date_period_it_invalidate_current(zend_object_iterator *iter TSRMLS_ { date_period_it *iterator = (date_period_it *)iter; - if (iterator->current) { + if (Z_TYPE(iterator->current) != IS_UNDEF) { zval_ptr_dtor(&iterator->current); - iterator->current = NULL; + ZVAL_UNDEF(&iterator->current); } } /* }}} */ - /* {{{ date_period_it_dtor */ static void date_period_it_dtor(zend_object_iterator *iter TSRMLS_DC) { @@ -1869,18 +1865,15 @@ static void date_period_it_dtor(zend_object_iterator *iter TSRMLS_DC) date_period_it_invalidate_current(iter TSRMLS_CC); - zval_ptr_dtor(&iterator->date_period_zval); - - efree(iterator); + zval_ptr_dtor(&iterator->intern.data); } /* }}} */ - /* {{{ date_period_it_has_more */ static int date_period_it_has_more(zend_object_iterator *iter TSRMLS_DC) { date_period_it *iterator = (date_period_it *)iter; - php_period_obj *object = iterator->object; + php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data); timelib_time *it_time = object->current; /* apply modification if it's not the first iteration */ @@ -1900,19 +1893,17 @@ static int date_period_it_has_more(zend_object_iterator *iter TSRMLS_DC) } /* }}} */ - /* {{{ date_period_it_current_data */ -static void date_period_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) +static zval *date_period_it_current_data(zend_object_iterator *iter TSRMLS_DC) { date_period_it *iterator = (date_period_it *)iter; - php_period_obj *object = iterator->object; + php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data); timelib_time *it_time = object->current; php_date_obj *newdateobj; /* Create new object */ - MAKE_STD_ZVAL(iterator->current); - php_date_instantiate(object->start_ce, iterator->current TSRMLS_CC); - newdateobj = (php_date_obj *) zend_object_store_get_object(iterator->current TSRMLS_CC); + php_date_instantiate(object->start_ce, &iterator->current TSRMLS_CC); + newdateobj = Z_PHPDATE_P(&iterator->current); newdateobj->time = timelib_time_ctor(); *newdateobj->time = *it_time; if (it_time->tz_abbr) { @@ -1922,11 +1913,10 @@ static void date_period_it_current_data(zend_object_iterator *iter, zval ***data newdateobj->time->tz_info = it_time->tz_info; } - *data = &iterator->current; + return &iterator->current; } /* }}} */ - /* {{{ date_period_it_current_key */ static void date_period_it_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC) { @@ -1935,7 +1925,6 @@ static void date_period_it_current_key(zend_object_iterator *iter, zval *key TSR } /* }}} */ - /* {{{ date_period_it_move_forward */ static void date_period_it_move_forward(zend_object_iterator *iter TSRMLS_DC) { @@ -1946,11 +1935,10 @@ static void date_period_it_move_forward(zend_object_iterator *iter TSRMLS_DC) } /* }}} */ - /* {{{ date_period_it_rewind */ static void date_period_it_rewind(zend_object_iterator *iter TSRMLS_DC) { - date_period_it *iterator = (date_period_it *)iter; + date_period_it *iterator = (date_period_it *)iter; iterator->current_index = 0; if (iterator->object->current) { @@ -1961,7 +1949,6 @@ static void date_period_it_rewind(zend_object_iterator *iter TSRMLS_DC) } /* }}} */ - /* iterator handler table */ zend_object_iterator_funcs date_period_it_funcs = { date_period_it_dtor, @@ -1973,28 +1960,25 @@ zend_object_iterator_funcs date_period_it_funcs = { date_period_it_invalidate_current }; - - -zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) +zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) /* {{{ */ { - date_period_it *iterator = emalloc(sizeof(date_period_it)); - php_period_obj *dpobj = (php_period_obj *)zend_object_store_get_object(object TSRMLS_CC); + date_period_it *iterator = emalloc(sizeof(date_period_it)); if (by_ref) { zend_error(E_ERROR, "An iterator cannot be used with foreach by reference"); } - Z_ADDREF_P(object); - iterator->intern.data = (void*) dpobj; + zend_iterator_init((zend_object_iterator*)iterator TSRMLS_CC); + + ZVAL_COPY(&iterator->intern.data, object); iterator->intern.funcs = &date_period_it_funcs; - iterator->date_period_zval = object; - iterator->object = dpobj; - iterator->current = NULL; + iterator->object = Z_PHPPERIOD_P(object); + ZVAL_UNDEF(&iterator->current); return (zend_object_iterator*)iterator; -} +} /* }}} */ -static int implement_date_interface_handler(zend_class_entry *interface, zend_class_entry *implementor TSRMLS_DC) +static int implement_date_interface_handler(zend_class_entry *interface, zend_class_entry *implementor TSRMLS_DC) /* {{{ */ { if (implementor->type == ZEND_USER_CLASS && !instanceof_function(implementor, date_ce_date TSRMLS_CC) && @@ -2004,9 +1988,9 @@ static int implement_date_interface_handler(zend_class_entry *interface, zend_cl } return SUCCESS; -} +} /* }}} */ -static void date_register_classes(TSRMLS_D) +static void date_register_classes(TSRMLS_D) /* {{{ */ { zend_class_entry ce_date, ce_immutable, ce_timezone, ce_interval, ce_period, ce_interface; @@ -2016,8 +2000,10 @@ static void date_register_classes(TSRMLS_D) INIT_CLASS_ENTRY(ce_date, "DateTime", date_funcs_date); ce_date.create_object = date_object_new_date; - date_ce_date = zend_register_internal_class_ex(&ce_date, NULL, NULL TSRMLS_CC); + date_ce_date = zend_register_internal_class_ex(&ce_date, NULL TSRMLS_CC); memcpy(&date_object_handlers_date, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_date.offset = XtOffsetOf(php_date_obj, std); + date_object_handlers_date.free_obj = date_object_free_storage_date; date_object_handlers_date.clone_obj = date_object_clone_date; date_object_handlers_date.compare_objects = date_object_compare_date; date_object_handlers_date.get_properties = date_object_get_properties; @@ -2041,7 +2027,7 @@ static void date_register_classes(TSRMLS_D) INIT_CLASS_ENTRY(ce_immutable, "DateTimeImmutable", date_funcs_immutable); ce_immutable.create_object = date_object_new_date; - date_ce_immutable = zend_register_internal_class_ex(&ce_immutable, NULL, NULL TSRMLS_CC); + date_ce_immutable = zend_register_internal_class_ex(&ce_immutable, NULL TSRMLS_CC); memcpy(&date_object_handlers_immutable, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); date_object_handlers_immutable.clone_obj = date_object_clone_date; date_object_handlers_immutable.compare_objects = date_object_compare_date; @@ -2050,8 +2036,10 @@ static void date_register_classes(TSRMLS_D) INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", date_funcs_timezone); ce_timezone.create_object = date_object_new_timezone; - date_ce_timezone = zend_register_internal_class_ex(&ce_timezone, NULL, NULL TSRMLS_CC); + date_ce_timezone = zend_register_internal_class_ex(&ce_timezone, NULL TSRMLS_CC); memcpy(&date_object_handlers_timezone, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_timezone.offset = XtOffsetOf(php_timezone_obj, std); + date_object_handlers_timezone.free_obj = date_object_free_storage_timezone; date_object_handlers_timezone.clone_obj = date_object_clone_timezone; date_object_handlers_timezone.get_properties = date_object_get_properties_timezone; date_object_handlers_timezone.get_gc = date_object_get_gc_timezone; @@ -2076,8 +2064,10 @@ static void date_register_classes(TSRMLS_D) INIT_CLASS_ENTRY(ce_interval, "DateInterval", date_funcs_interval); ce_interval.create_object = date_object_new_interval; - date_ce_interval = zend_register_internal_class_ex(&ce_interval, NULL, NULL TSRMLS_CC); + date_ce_interval = zend_register_internal_class_ex(&ce_interval, NULL TSRMLS_CC); memcpy(&date_object_handlers_interval, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_interval.offset = XtOffsetOf(php_interval_obj, std); + date_object_handlers_interval.free_obj = date_object_free_storage_interval; date_object_handlers_interval.clone_obj = date_object_clone_interval; date_object_handlers_interval.read_property = date_interval_read_property; date_object_handlers_interval.write_property = date_interval_write_property; @@ -2087,11 +2077,13 @@ static void date_register_classes(TSRMLS_D) INIT_CLASS_ENTRY(ce_period, "DatePeriod", date_funcs_period); ce_period.create_object = date_object_new_period; - date_ce_period = zend_register_internal_class_ex(&ce_period, NULL, NULL TSRMLS_CC); + date_ce_period = zend_register_internal_class_ex(&ce_period, NULL TSRMLS_CC); date_ce_period->get_iterator = date_object_period_get_iterator; date_ce_period->iterator_funcs.funcs = &date_period_it_funcs; zend_class_implements(date_ce_period TSRMLS_CC, 1, zend_ce_traversable); memcpy(&date_object_handlers_period, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + date_object_handlers_period.offset = XtOffsetOf(php_period_obj, std); + date_object_handlers_period.free_obj = date_object_free_storage_period; date_object_handlers_period.clone_obj = date_object_clone_period; date_object_handlers_period.get_properties = date_object_get_properties_period; date_object_handlers_period.get_property_ptr_ptr = NULL; @@ -2103,42 +2095,36 @@ static void date_register_classes(TSRMLS_D) zend_declare_class_constant_long(date_ce_period, const_name, sizeof(const_name)-1, value TSRMLS_CC); REGISTER_PERIOD_CLASS_CONST_STRING("EXCLUDE_START_DATE", PHP_DATE_PERIOD_EXCLUDE_START_DATE); -} +} /* }}} */ -static inline zend_object_value date_object_new_date_ex(zend_class_entry *class_type, php_date_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_date_ex(zend_class_entry *class_type, int init_props TSRMLS_DC) /* {{{ */ { php_date_obj *intern; - zend_object_value retval; - intern = emalloc(sizeof(php_date_obj)); - memset(intern, 0, sizeof(php_date_obj)); - if (ptr) { - *ptr = intern; - } + intern = ecalloc(1, sizeof(php_date_obj) + sizeof(zval) * (class_type->default_properties_count - 1)); zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); - - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_date, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_date; + if (init_props) { + object_properties_init(&intern->std, class_type); + } + intern->std.handlers = &date_object_handlers_date; - return retval; -} + return &intern->std; +} /* }}} */ -static zend_object_value date_object_new_date(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_date(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ { - return date_object_new_date_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_date_ex(class_type, 1 TSRMLS_CC); +} /* }}} */ -static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_date(zval *this_ptr TSRMLS_DC) /* {{{ */ { - php_date_obj *new_obj = NULL; - php_date_obj *old_obj = (php_date_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_date_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_date_obj *old_obj = Z_PHPDATE_P(this_ptr); + php_date_obj *new_obj = php_date_obj_from_obj(date_object_new_date_ex(old_obj->std.ce, 0 TSRMLS_CC)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std TSRMLS_CC); if (!old_obj->time) { - return new_ov; + return &new_obj->std; } /* this should probably moved to a new `timelib_time *timelime_time_clone(timelib_time *)` */ @@ -2151,26 +2137,20 @@ static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC) new_obj->time->tz_info = old_obj->time->tz_info; } - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static zval* date_clone_immutable(zval *object TSRMLS_DC) +static void date_clone_immutable(zval *object, zval *new_object TSRMLS_DC) /* {{{ */ { - zval *new_object; - - ALLOC_ZVAL(new_object); - Z_OBJVAL_P(new_object) = date_object_clone_date(object TSRMLS_CC); - Z_SET_REFCOUNT_P(new_object, 1); - Z_SET_ISREF_P(new_object); - Z_TYPE_P(new_object) = IS_OBJECT; - - return new_object; -} + ZVAL_OBJ(new_object, date_object_clone_date(object TSRMLS_CC)); +//??? Z_SET_REFCOUNT_P(new_object, 1); +//??? Z_SET_ISREF_P(new_object); +} /* }}} */ -static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC) +static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC) /* {{{ */ { - php_date_obj *o1 = zend_object_store_get_object(d1 TSRMLS_CC); - php_date_obj *o2 = zend_object_store_get_object(d2 TSRMLS_CC); + php_date_obj *o1 = Z_PHPDATE_P(d1); + php_date_obj *o2 = Z_PHPDATE_P(d2); if (!o1->time || !o2->time) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to compare an incomplete DateTime or DateTimeImmutable object"); @@ -2184,31 +2164,30 @@ static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC) } return (o1->time->sse == o2->time->sse) ? 0 : ((o1->time->sse < o2->time->sse) ? -1 : 1); -} +} /* }}} */ -static HashTable *date_object_get_gc(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc(zval *object, zval **table, int *n TSRMLS_DC) /* {{{ */ { *table = NULL; *n = 0; return zend_std_get_properties(object TSRMLS_CC); -} +} /* }}} */ -static HashTable *date_object_get_gc_timezone(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc_timezone(zval *object, zval **table, int *n TSRMLS_DC) /* {{{ */ { - *table = NULL; *n = 0; return zend_std_get_properties(object TSRMLS_CC); -} +} /* }}} */ -static HashTable *date_object_get_properties(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties(zval *object TSRMLS_DC) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); props = zend_std_get_properties(object TSRMLS_CC); @@ -2217,77 +2196,68 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC) } /* first we add the date and time in ISO format */ - MAKE_STD_ZVAL(zv); - ZVAL_STRING(zv, date_format("Y-m-d H:i:s", 12, dateobj->time, 1), 0); - zend_hash_update(props, "date", 5, &zv, sizeof(zv), NULL); + ZVAL_STR(&zv, date_format("Y-m-d H:i:s", sizeof("Y-m-d H:i:s")-1, dateobj->time, 1 TSRMLS_CC)); + zend_hash_str_update(props, "date", sizeof("date")-1, &zv); /* then we add the timezone name (or similar) */ if (dateobj->time->is_localtime) { - MAKE_STD_ZVAL(zv); - ZVAL_LONG(zv, dateobj->time->zone_type); - zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, dateobj->time->zone_type); + zend_hash_str_update(props, "timezone_type", sizeof("timezone_type")-1, &zv); - MAKE_STD_ZVAL(zv); switch (dateobj->time->zone_type) { case TIMELIB_ZONETYPE_ID: - ZVAL_STRING(zv, dateobj->time->tz_info->name, 1); + ZVAL_STRING(&zv, dateobj->time->tz_info->name); break; case TIMELIB_ZONETYPE_OFFSET: { - char *tmpstr = emalloc(sizeof("UTC+05:00")); + zend_string *tmpstr = STR_ALLOC(sizeof("UTC+05:00")-1, 0); timelib_sll utc_offset = dateobj->time->z; - snprintf(tmpstr, sizeof("+05:00"), "%c%02d:%02d", + tmpstr->len = snprintf(tmpstr->val, sizeof("+05:00"), "%c%02d:%02d", utc_offset > 0 ? '-' : '+', abs(utc_offset / 60), abs((utc_offset % 60))); - ZVAL_STRING(zv, tmpstr, 0); + ZVAL_STR(&zv, tmpstr); } break; case TIMELIB_ZONETYPE_ABBR: - ZVAL_STRING(zv, dateobj->time->tz_abbr, 1); + ZVAL_STRING(&zv, dateobj->time->tz_abbr); break; } - zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "timezone", sizeof("timezone")-1, &zv); } return props; -} +} /* }}} */ -static inline zend_object_value date_object_new_timezone_ex(zend_class_entry *class_type, php_timezone_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_timezone_ex(zend_class_entry *class_type, int init_props TSRMLS_DC) /* {{{ */ { php_timezone_obj *intern; - zend_object_value retval; - intern = emalloc(sizeof(php_timezone_obj)); - memset(intern, 0, sizeof(php_timezone_obj)); - if (ptr) { - *ptr = intern; - } + intern = ecalloc(1, sizeof(php_timezone_obj) + sizeof(zval) * (class_type->default_properties_count - 1)); zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); - - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_timezone, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_timezone; + if (init_props) { + object_properties_init(&intern->std, class_type); + } + intern->std.handlers = &date_object_handlers_timezone; - return retval; -} + return &intern->std; +} /* }}} */ -static zend_object_value date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ { - return date_object_new_timezone_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_timezone_ex(class_type, 1 TSRMLS_CC); +} /* }}} */ -static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_timezone(zval *this_ptr TSRMLS_DC) /* {{{ */ { - php_timezone_obj *new_obj = NULL; - php_timezone_obj *old_obj = (php_timezone_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_timezone_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_timezone_obj *old_obj = Z_PHPTIMEZONE_P(this_ptr); + php_timezone_obj *new_obj = php_timezone_obj_from_obj(date_object_new_timezone_ex(old_obj->std.ce, 0 TSRMLS_CC)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std TSRMLS_CC); if (!old_obj->initialized) { - return new_ov; + return &new_obj->std; } new_obj->type = old_obj->type; @@ -2306,17 +2276,17 @@ static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC) break; } - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_timezone_obj *tzobj; - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); props = zend_std_get_properties(object TSRMLS_CC); @@ -2324,87 +2294,79 @@ static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC) return props; } - MAKE_STD_ZVAL(zv); - ZVAL_LONG(zv, tzobj->type); - zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, tzobj->type); + zend_hash_str_update(props, "timezone_type", sizeof("timezone_type")-1, &zv); - MAKE_STD_ZVAL(zv); switch (tzobj->type) { case TIMELIB_ZONETYPE_ID: - ZVAL_STRING(zv, tzobj->tzi.tz->name, 1); + ZVAL_STRING(&zv, tzobj->tzi.tz->name); break; case TIMELIB_ZONETYPE_OFFSET: { - char *tmpstr = emalloc(sizeof("UTC+05:00")); + zend_string *tmpstr = STR_ALLOC(sizeof("UTC+05:00")-1, 0); - snprintf(tmpstr, sizeof("+05:00"), "%c%02d:%02d", + tmpstr->len = snprintf(tmpstr->val, sizeof("+05:00"), "%c%02d:%02d", tzobj->tzi.utc_offset > 0 ? '-' : '+', abs(tzobj->tzi.utc_offset / 60), abs((tzobj->tzi.utc_offset % 60))); - ZVAL_STRING(zv, tmpstr, 0); + ZVAL_STR(&zv, tmpstr); } break; case TIMELIB_ZONETYPE_ABBR: - ZVAL_STRING(zv, tzobj->tzi.z.abbr, 1); + ZVAL_STRING(&zv, tzobj->tzi.z.abbr); break; } - zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "timezone", sizeof("timezone")-1, &zv); return props; -} +} /* }}} */ -static inline zend_object_value date_object_new_interval_ex(zend_class_entry *class_type, php_interval_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_interval_ex(zend_class_entry *class_type, int init_props TSRMLS_DC) /* {{{ */ { php_interval_obj *intern; - zend_object_value retval; - intern = emalloc(sizeof(php_interval_obj)); - memset(intern, 0, sizeof(php_interval_obj)); - if (ptr) { - *ptr = intern; - } + intern = ecalloc(1, sizeof(php_interval_obj) + sizeof(zval) * (class_type->default_properties_count - 1)); zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); - - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_interval, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_interval; + if (init_props) { + object_properties_init(&intern->std, class_type); + } + intern->std.handlers = &date_object_handlers_interval; - return retval; -} + return &intern->std; +} /* }}} */ -static zend_object_value date_object_new_interval(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_interval(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ { - return date_object_new_interval_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_interval_ex(class_type, 1 TSRMLS_CC); +} /* }}} */ -static zend_object_value date_object_clone_interval(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_interval(zval *this_ptr TSRMLS_DC) /* {{{ */ { - php_interval_obj *new_obj = NULL; - php_interval_obj *old_obj = (php_interval_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_interval_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_interval_obj *old_obj = Z_PHPINTERVAL_P(this_ptr); + php_interval_obj *new_obj = php_interval_obj_from_obj(date_object_new_interval_ex(old_obj->std.ce, 0 TSRMLS_CC)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std TSRMLS_CC); /** FIX ME ADD CLONE STUFF **/ - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static HashTable *date_object_get_gc_interval(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc_interval(zval *object, zval **table, int *n TSRMLS_DC) /* {{{ */ { *table = NULL; *n = 0; return zend_std_get_properties(object TSRMLS_CC); -} +} /* }}} */ -static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_interval_obj *intervalobj; - intervalobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC); + intervalobj = Z_PHPINTERVAL_P(object); props = zend_std_get_properties(object TSRMLS_CC); @@ -2413,9 +2375,8 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) } #define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \ - MAKE_STD_ZVAL(zv); \ - ZVAL_LONG(zv, (long)intervalobj->diff->f); \ - zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, (long)intervalobj->diff->f); \ + zend_hash_str_update(props, n, sizeof(n)-1, &zv); PHP_DATE_INTERVAL_ADD_PROPERTY("y", y); PHP_DATE_INTERVAL_ADD_PROPERTY("m", m); @@ -2430,9 +2391,8 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) if (intervalobj->diff->days != -99999) { PHP_DATE_INTERVAL_ADD_PROPERTY("days", days); } else { - MAKE_STD_ZVAL(zv); - ZVAL_FALSE(zv); - zend_hash_update(props, "days", 5, &zv, sizeof(zv), NULL); + ZVAL_FALSE(&zv); + zend_hash_str_update(props, "days", sizeof("days")-1, &zv); } PHP_DATE_INTERVAL_ADD_PROPERTY("special_type", special.type); PHP_DATE_INTERVAL_ADD_PROPERTY("special_amount", special.amount); @@ -2440,80 +2400,72 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) PHP_DATE_INTERVAL_ADD_PROPERTY("have_special_relative", have_special_relative); return props; -} +} /* }}} */ -static inline zend_object_value date_object_new_period_ex(zend_class_entry *class_type, php_period_obj **ptr TSRMLS_DC) +static inline zend_object *date_object_new_period_ex(zend_class_entry *class_type, int init_props TSRMLS_DC) /* {{{ */ { php_period_obj *intern; - zend_object_value retval; - intern = emalloc(sizeof(php_period_obj)); - memset(intern, 0, sizeof(php_period_obj)); - if (ptr) { - *ptr = intern; - } + intern = ecalloc(1, sizeof(php_period_obj) + sizeof(zval) * (class_type->default_properties_count - 1)); zend_object_std_init(&intern->std, class_type TSRMLS_CC); - object_properties_init(&intern->std, class_type); - - retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_period, NULL TSRMLS_CC); - retval.handlers = &date_object_handlers_period; + if (init_props) { + object_properties_init(&intern->std, class_type); + } +//??? date_object_free_storage_period, NULL TSRMLS_CC); + intern->std.handlers = &date_object_handlers_period; - return retval; -} + return &intern->std; +} /* }}} */ -static zend_object_value date_object_new_period(zend_class_entry *class_type TSRMLS_DC) +static zend_object *date_object_new_period(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ { - return date_object_new_period_ex(class_type, NULL TSRMLS_CC); -} + return date_object_new_period_ex(class_type, 1 TSRMLS_CC); +} /* }}} */ -static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC) +static zend_object *date_object_clone_period(zval *this_ptr TSRMLS_DC) /* {{{ */ { - php_period_obj *new_obj = NULL; - php_period_obj *old_obj = (php_period_obj *) zend_object_store_get_object(this_ptr TSRMLS_CC); - zend_object_value new_ov = date_object_new_period_ex(old_obj->std.ce, &new_obj TSRMLS_CC); + php_period_obj *old_obj = Z_PHPPERIOD_P(this_ptr); + php_period_obj *new_obj = php_period_obj_from_obj(date_object_new_period_ex(old_obj->std.ce, 0 TSRMLS_CC)); - zend_objects_clone_members(&new_obj->std, new_ov, &old_obj->std, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->std, &old_obj->std TSRMLS_CC); /** FIX ME ADD CLONE STUFF **/ - return new_ov; -} + return &new_obj->std; +} /* }}} */ -static void date_object_free_storage_date(void *object TSRMLS_DC) +static void date_object_free_storage_date(zend_object *object TSRMLS_DC) /* {{{ */ { - php_date_obj *intern = (php_date_obj *)object; + php_date_obj *intern = php_date_obj_from_obj(object); if (intern->time) { timelib_time_dtor(intern->time); } zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} +} /* }}} */ -static void date_object_free_storage_timezone(void *object TSRMLS_DC) +static void date_object_free_storage_timezone(zend_object *object TSRMLS_DC) /* {{{ */ { - php_timezone_obj *intern = (php_timezone_obj *)object; + php_timezone_obj *intern = php_timezone_obj_from_obj(object); if (intern->type == TIMELIB_ZONETYPE_ABBR) { free(intern->tzi.z.abbr); } zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} +} /* }}} */ -static void date_object_free_storage_interval(void *object TSRMLS_DC) +static void date_object_free_storage_interval(zend_object *object TSRMLS_DC) /* {{{ */ { - php_interval_obj *intern = (php_interval_obj *)object; + php_interval_obj *intern = php_interval_obj_from_obj(object); timelib_rel_time_dtor(intern->diff); zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} +} /* }}} */ -static void date_object_free_storage_period(void *object TSRMLS_DC) +static void date_object_free_storage_period(zend_object *object TSRMLS_DC) /* {{{ */ { - php_period_obj *intern = (php_period_obj *)object; + php_period_obj *intern = php_period_obj_from_obj(object); if (intern->start) { timelib_time_dtor(intern->start); @@ -2529,39 +2481,34 @@ static void date_object_free_storage_period(void *object TSRMLS_DC) timelib_rel_time_dtor(intern->interval); zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(object); -} +} /* }}} */ /* Advanced Interface */ -PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC) +PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC) /* {{{ */ { - Z_TYPE_P(object) = IS_OBJECT; object_init_ex(object, pce); - Z_SET_REFCOUNT_P(object, 1); - Z_UNSET_ISREF_P(object); - return object; -} +} /* }}} */ /* Helper function used to store the latest found warnings and errors while * parsing, from either strtotime or parse_from_format. */ -static void update_errors_warnings(timelib_error_container *last_errors TSRMLS_DC) +static void update_errors_warnings(timelib_error_container *last_errors TSRMLS_DC) /* {{{ */ { if (DATEG(last_errors)) { timelib_error_container_dtor(DATEG(last_errors)); DATEG(last_errors) = NULL; } DATEG(last_errors) = last_errors; -} +} /* }}} */ -PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC) +PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC) /* {{{ */ { timelib_time *now; timelib_tzinfo *tzi = NULL; timelib_error_container *err = NULL; int type = TIMELIB_ZONETYPE_ID, new_dst = 0; char *new_abbr = NULL; - timelib_sll new_offset; + timelib_sll new_offset = 0; if (dateobj->time) { timelib_time_dtor(dateobj->time); @@ -2588,7 +2535,7 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, if (timezone_object) { php_timezone_obj *tzobj; - tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone_object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(timezone_object); switch (tzobj->type) { case TIMELIB_ZONETYPE_ID: tzi = tzobj->tzi.tz; @@ -2635,7 +2582,7 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, timelib_time_dtor(now); return 1; -} +} /* }}} */ /* {{{ proto DateTime date_create([string time[, DateTimeZone object]]) Returns new DateTime object @@ -2651,7 +2598,8 @@ PHP_FUNCTION(date_create) } php_date_instantiate(date_ce_date, return_value TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(return_value TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) { + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) { + zval_dtor(return_value); RETURN_FALSE; } } @@ -2671,7 +2619,8 @@ PHP_FUNCTION(date_create_immutable) } php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(return_value TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) { + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) { + zval_dtor(return_value); RETURN_FALSE; } } @@ -2691,7 +2640,8 @@ PHP_FUNCTION(date_create_from_format) } php_date_instantiate(date_ce_date, return_value TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(return_value TSRMLS_CC), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) { + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) { + zval_dtor(return_value); RETURN_FALSE; } } @@ -2711,7 +2661,8 @@ PHP_FUNCTION(date_create_immutable_from_format) } php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(return_value TSRMLS_CC), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) { + if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) { + zval_dtor(return_value); RETURN_FALSE; } } @@ -2729,8 +2680,8 @@ PHP_METHOD(DateTime, __construct) zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { - if (!php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) { - ZVAL_NULL(getThis()); + if (!php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) { +//??? ZVAL_NULL(getThis()); } } zend_restore_error_handling(&error_handling TSRMLS_CC); @@ -2749,7 +2700,7 @@ PHP_METHOD(DateTimeImmutable, __construct) zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { - php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC); + php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC); } zend_restore_error_handling(&error_handling TSRMLS_CC); } @@ -2769,8 +2720,8 @@ PHP_METHOD(DateTimeImmutable, createFromMutable) } php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC); - old_obj = (php_date_obj *) zend_object_store_get_object(datetime_object TSRMLS_CC); - new_obj = (php_date_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + old_obj = Z_PHPDATE_P(datetime_object); + new_obj = Z_PHPDATE_P(return_value); new_obj->time = timelib_time_ctor(); *new_obj->time = *old_obj->time; @@ -2783,50 +2734,52 @@ PHP_METHOD(DateTimeImmutable, createFromMutable) } /* }}} */ -static int php_date_initialize_from_hash(zval **return_value, php_date_obj **dateobj, HashTable *myht TSRMLS_DC) +static int php_date_initialize_from_hash(zval *return_value, php_date_obj **dateobj, HashTable *myht TSRMLS_DC) /* {{{ */ { - zval **z_date = NULL; - zval **z_timezone = NULL; - zval **z_timezone_type = NULL; - zval *tmp_obj = NULL; + zval *z_date; + zval *z_timezone; + zval *z_timezone_type; + zval tmp_obj; timelib_tzinfo *tzi; php_timezone_obj *tzobj; - if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS) { - convert_to_string(*z_date); - if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS) { - convert_to_long(*z_timezone_type); - if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) { - convert_to_string(*z_timezone); - - switch (Z_LVAL_PP(z_timezone_type)) { + z_date = zend_hash_str_find(myht, "date", sizeof("data")-1); + if (z_date) { + convert_to_string(z_date); + z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1); + if (z_timezone_type) { + convert_to_long(z_timezone_type); + z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1); + if (z_timezone) { + convert_to_string(z_timezone); + + switch (Z_LVAL_P(z_timezone_type)) { case TIMELIB_ZONETYPE_OFFSET: case TIMELIB_ZONETYPE_ABBR: { - char *tmp = emalloc(Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 2); + char *tmp = emalloc(Z_STRLEN_P(z_date) + Z_STRLEN_P(z_timezone) + 2); int ret; - snprintf(tmp, Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 2, "%s %s", Z_STRVAL_PP(z_date), Z_STRVAL_PP(z_timezone)); - ret = php_date_initialize(*dateobj, tmp, Z_STRLEN_PP(z_date) + Z_STRLEN_PP(z_timezone) + 1, NULL, NULL, 0 TSRMLS_CC); + snprintf(tmp, Z_STRLEN_P(z_date) + Z_STRLEN_P(z_timezone) + 2, "%s %s", Z_STRVAL_P(z_date), Z_STRVAL_P(z_timezone)); + ret = php_date_initialize(*dateobj, tmp, Z_STRLEN_P(z_date) + Z_STRLEN_P(z_timezone) + 1, NULL, NULL, 0 TSRMLS_CC); efree(tmp); return 1 == ret; } case TIMELIB_ZONETYPE_ID: { int ret; - convert_to_string(*z_timezone); + convert_to_string(z_timezone); - tzi = php_date_parse_tzfile(Z_STRVAL_PP(z_timezone), DATE_TIMEZONEDB TSRMLS_CC); + tzi = php_date_parse_tzfile(Z_STRVAL_P(z_timezone), DATE_TIMEZONEDB TSRMLS_CC); if (tzi == NULL) { return 0; } - ALLOC_INIT_ZVAL(tmp_obj); - tzobj = zend_object_store_get_object(php_date_instantiate(date_ce_timezone, tmp_obj TSRMLS_CC) TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(php_date_instantiate(date_ce_timezone, &tmp_obj TSRMLS_CC)); tzobj->type = TIMELIB_ZONETYPE_ID; tzobj->tzi.tz = tzi; tzobj->initialized = 1; - ret = php_date_initialize(*dateobj, Z_STRVAL_PP(z_date), Z_STRLEN_PP(z_date), NULL, tmp_obj, 0 TSRMLS_CC); + ret = php_date_initialize(*dateobj, Z_STRVAL_P(z_date), Z_STRLEN_P(z_date), NULL, &tmp_obj, 0 TSRMLS_CC); zval_ptr_dtor(&tmp_obj); return 1 == ret; } @@ -2835,7 +2788,7 @@ static int php_date_initialize_from_hash(zval **return_value, php_date_obj **dat } } return 0; -} +} /* }}} */ /* {{{ proto DateTime::__set_state() */ @@ -2852,8 +2805,8 @@ PHP_METHOD(DateTime, __set_state) myht = HASH_OF(array); php_date_instantiate(date_ce_date, return_value TSRMLS_CC); - dateobj = (php_date_obj *) zend_object_store_get_object(return_value TSRMLS_CC); - if (!php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC)) { + dateobj = Z_PHPDATE_P(return_value); + if (!php_date_initialize_from_hash(return_value, &dateobj, myht TSRMLS_CC)) { php_error(E_ERROR, "Invalid serialization data for DateTime object"); } } @@ -2874,8 +2827,8 @@ PHP_METHOD(DateTimeImmutable, __set_state) myht = HASH_OF(array); php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC); - dateobj = (php_date_obj *) zend_object_store_get_object(return_value TSRMLS_CC); - if (!php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC)) { + dateobj = Z_PHPDATE_P(return_value); + if (!php_date_initialize_from_hash(return_value, &dateobj, myht TSRMLS_CC)) { php_error(E_ERROR, "Invalid serialization data for DateTimeImmutable object"); } } @@ -2889,38 +2842,36 @@ PHP_METHOD(DateTime, __wakeup) php_date_obj *dateobj; HashTable *myht; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); myht = Z_OBJPROP_P(object); - if (!php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC)) { + if (!php_date_initialize_from_hash(return_value, &dateobj, myht TSRMLS_CC)) { php_error(E_ERROR, "Invalid serialization data for DateTime object"); } } /* }}} */ /* Helper function used to add an associative array of warnings and errors to a zval */ -static void zval_from_error_container(zval *z, timelib_error_container *error) +static void zval_from_error_container(zval *z, timelib_error_container *error) /* {{{ */ { int i; - zval *element; + zval element; add_assoc_long(z, "warning_count", error->warning_count); - MAKE_STD_ZVAL(element); - array_init(element); + array_init(&element); for (i = 0; i < error->warning_count; i++) { - add_index_string(element, error->warning_messages[i].position, error->warning_messages[i].message, 1); + add_index_string(&element, error->warning_messages[i].position, error->warning_messages[i].message); } - add_assoc_zval(z, "warnings", element); + add_assoc_zval(z, "warnings", &element); add_assoc_long(z, "error_count", error->error_count); - MAKE_STD_ZVAL(element); - array_init(element); + array_init(&element); for (i = 0; i < error->error_count; i++) { - add_index_string(element, error->error_messages[i].position, error->error_messages[i].message, 1); + add_index_string(&element, error->error_messages[i].position, error->error_messages[i].message); } - add_assoc_zval(z, "errors", element); -} + add_assoc_zval(z, "errors", &element); +} /* }}} */ /* {{{ proto array date_get_last_errors() Returns the warnings and errors found while parsing a date/time string. @@ -2936,9 +2887,9 @@ PHP_FUNCTION(date_get_last_errors) } /* }}} */ -void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *parsed_time, struct timelib_error_container *error) +void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *parsed_time, struct timelib_error_container *error) /* {{{ */ { - zval *element; + zval element; array_init(return_value); #define PHP_DATE_PARSE_DATE_SET_TIME_ELEMENT(name, elem) \ @@ -2975,41 +2926,40 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time * break; case TIMELIB_ZONETYPE_ID: if (parsed_time->tz_abbr) { - add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr, 1); + add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr); } if (parsed_time->tz_info) { - add_assoc_string(return_value, "tz_id", parsed_time->tz_info->name, 1); + add_assoc_string(return_value, "tz_id", parsed_time->tz_info->name); } break; case TIMELIB_ZONETYPE_ABBR: PHP_DATE_PARSE_DATE_SET_TIME_ELEMENT(zone, z); add_assoc_bool(return_value, "is_dst", parsed_time->dst); - add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr, 1); + add_assoc_string(return_value, "tz_abbr", parsed_time->tz_abbr); break; } } if (parsed_time->have_relative) { - MAKE_STD_ZVAL(element); - array_init(element); - add_assoc_long(element, "year", parsed_time->relative.y); - add_assoc_long(element, "month", parsed_time->relative.m); - add_assoc_long(element, "day", parsed_time->relative.d); - add_assoc_long(element, "hour", parsed_time->relative.h); - add_assoc_long(element, "minute", parsed_time->relative.i); - add_assoc_long(element, "second", parsed_time->relative.s); + array_init(&element); + add_assoc_long(&element, "year", parsed_time->relative.y); + add_assoc_long(&element, "month", parsed_time->relative.m); + add_assoc_long(&element, "day", parsed_time->relative.d); + add_assoc_long(&element, "hour", parsed_time->relative.h); + add_assoc_long(&element, "minute", parsed_time->relative.i); + add_assoc_long(&element, "second", parsed_time->relative.s); if (parsed_time->relative.have_weekday_relative) { - add_assoc_long(element, "weekday", parsed_time->relative.weekday); + add_assoc_long(&element, "weekday", parsed_time->relative.weekday); } if (parsed_time->relative.have_special_relative && (parsed_time->relative.special.type == TIMELIB_SPECIAL_WEEKDAY)) { - add_assoc_long(element, "weekdays", parsed_time->relative.special.amount); + add_assoc_long(&element, "weekdays", parsed_time->relative.special.amount); } if (parsed_time->relative.first_last_day_of) { - add_assoc_bool(element, parsed_time->relative.first_last_day_of == 1 ? "first_day_of_month" : "last_day_of_month", 1); + add_assoc_bool(&element, parsed_time->relative.first_last_day_of == 1 ? "first_day_of_month" : "last_day_of_month", 1); } - add_assoc_zval(return_value, "relative", element); + add_assoc_zval(return_value, "relative", &element); } timelib_time_dtor(parsed_time); -} +} /* }}} */ /* {{{ proto array date_parse(string date) Returns associative array with detailed info about given date @@ -3062,19 +3012,19 @@ PHP_FUNCTION(date_format) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_interface, &format, &format_len) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - RETURN_STRING(date_format(format, format_len, dateobj->time, dateobj->time->is_localtime), 0); + RETURN_STR(date_format(format, format_len, dateobj->time, dateobj->time->is_localtime TSRMLS_CC)); } /* }}} */ -static int php_date_modify(zval *object, char *modify, int modify_len TSRMLS_DC) +static int php_date_modify(zval *object, char *modify, int modify_len TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; timelib_time *tmp_time; timelib_error_container *err = NULL; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); if (!(dateobj->time)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "The DateTime object has not been correctly initialized by its constructor"); @@ -3128,7 +3078,7 @@ static int php_date_modify(zval *object, char *modify, int modify_len TSRMLS_DC) dateobj->time->have_relative = 0; return 1; -} +} /* }}} */ /* {{{ proto DateTime date_modify(DateTime object, string modify) Alters the timestamp. @@ -3155,7 +3105,7 @@ PHP_FUNCTION(date_modify) */ PHP_METHOD(DateTimeImmutable, modify) { - zval *object, *new_object; + zval *object, new_object; char *modify; int modify_len; @@ -3163,30 +3113,30 @@ PHP_METHOD(DateTimeImmutable, modify) RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - if (php_date_modify(new_object, modify, modify_len TSRMLS_CC)) { - RETURN_ZVAL(new_object, 0, 1); + date_clone_immutable(object, &new_object TSRMLS_CC); + if (php_date_modify(&new_object, modify, modify_len TSRMLS_CC)) { + RETURN_ZVAL(&new_object, 0, 1); } RETURN_FALSE; } /* }}} */ -static void php_date_add(zval *object, zval *interval, zval *return_value TSRMLS_DC) +static void php_date_add(zval *object, zval *interval, zval *return_value TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; php_interval_obj *intobj; timelib_time *new_time; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - intobj = (php_interval_obj *) zend_object_store_get_object(interval TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(interval); DATE_CHECK_INITIALIZED(intobj->initialized, DateInterval); new_time = timelib_add(dateobj->time, intobj->diff); timelib_time_dtor(dateobj->time); dateobj->time = new_time; -} +} /* }}} */ /* {{{ proto DateTime date_add(DateTime object, DateInterval interval) Adds an interval to the current date in object. @@ -3209,28 +3159,28 @@ PHP_FUNCTION(date_add) */ PHP_METHOD(DateTimeImmutable, add) { - zval *object, *interval, *new_object; + zval *object, *interval, new_object; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_immutable, &interval, date_ce_interval) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_add(new_object, interval, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object TSRMLS_CC); + php_date_add(&new_object, interval, return_value TSRMLS_CC); - RETURN_ZVAL(new_object, 0, 1); + RETURN_ZVAL(&new_object, 0, 1); } /* }}} */ -static void php_date_sub(zval *object, zval *interval, zval *return_value TSRMLS_DC) +static void php_date_sub(zval *object, zval *interval, zval *return_value TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; php_interval_obj *intobj; timelib_time *new_time; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - intobj = (php_interval_obj *) zend_object_store_get_object(interval TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(interval); DATE_CHECK_INITIALIZED(intobj->initialized, DateInterval); if (intobj->diff->have_special_relative) { @@ -3241,7 +3191,7 @@ static void php_date_sub(zval *object, zval *interval, zval *return_value TSRMLS new_time = timelib_sub(dateobj->time, intobj->diff); timelib_time_dtor(dateobj->time); dateobj->time = new_time; -} +} /* }}} */ /* {{{ proto DateTime date_sub(DateTime object, DateInterval interval) Subtracts an interval to the current date in object. @@ -3264,16 +3214,16 @@ PHP_FUNCTION(date_sub) */ PHP_METHOD(DateTimeImmutable, sub) { - zval *object, *interval, *new_object; + zval *object, *interval, new_object; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_immutable, &interval, date_ce_interval) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_sub(new_object, interval, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object TSRMLS_CC); + php_date_sub(&new_object, interval, return_value TSRMLS_CC); - RETURN_ZVAL(new_object, 0, 1); + RETURN_ZVAL(&new_object, 0, 1); } /* }}} */ @@ -3309,11 +3259,11 @@ PHP_FUNCTION(date_timezone_get) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_interface) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); if (dateobj->time->is_localtime/* && dateobj->time->tz_info*/) { php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC); - tzobj = (php_timezone_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(return_value); set_timezone_from_timelib_time(tzobj, dateobj->time); } else { RETURN_FALSE; @@ -3321,14 +3271,14 @@ PHP_FUNCTION(date_timezone_get) } /* }}} */ -static void php_date_timezone_set(zval *object, zval *timezone_object, zval *return_value TSRMLS_DC) +static void php_date_timezone_set(zval *object, zval *timezone_object, zval *return_value TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; php_timezone_obj *tzobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); - tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone_object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(timezone_object); switch (tzobj->type) { case TIMELIB_ZONETYPE_OFFSET: @@ -3342,7 +3292,7 @@ static void php_date_timezone_set(zval *object, zval *timezone_object, zval *ret break; } timelib_unixtime2local(dateobj->time, dateobj->time->sse); -} +} /* }}} */ /* {{{ proto DateTime date_timezone_set(DateTime object, DateTimeZone object) Sets the timezone for the DateTime object. @@ -3366,17 +3316,17 @@ PHP_FUNCTION(date_timezone_set) */ PHP_METHOD(DateTimeImmutable, setTimezone) { - zval *object, *new_object; + zval *object, new_object; zval *timezone_object; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_immutable, &timezone_object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_timezone_set(new_object, timezone_object, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object TSRMLS_CC); + php_date_timezone_set(&new_object, timezone_object, return_value TSRMLS_CC); - RETURN_ZVAL(new_object, 0, 1); + RETURN_ZVAL(&new_object, 0, 1); } /* }}} */ @@ -3392,7 +3342,7 @@ PHP_FUNCTION(date_offset_get) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_interface) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); if (dateobj->time->is_localtime/* && dateobj->time->tz_info*/) { switch (dateobj->time->zone_type) { @@ -3415,17 +3365,17 @@ PHP_FUNCTION(date_offset_get) } /* }}} */ -static void php_date_time_set(zval *object, long h, long i, long s, zval *return_value TSRMLS_DC) +static void php_date_time_set(zval *object, long h, long i, long s, zval *return_value TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); dateobj->time->h = h; dateobj->time->i = i; dateobj->time->s = s; timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_time_set(DateTime object, long hour, long minute[, long second]) Sets the time. @@ -3449,31 +3399,31 @@ PHP_FUNCTION(date_time_set) */ PHP_METHOD(DateTimeImmutable, setTime) { - zval *object, *new_object; + zval *object, new_object; long h, i, s = 0; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll|l", &object, date_ce_immutable, &h, &i, &s) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_time_set(new_object, h, i, s, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object TSRMLS_CC); + php_date_time_set(&new_object, h, i, s, return_value TSRMLS_CC); - RETURN_ZVAL(new_object, 0, 1); + RETURN_ZVAL(&new_object, 0, 1); } /* }}} */ -static void php_date_date_set(zval *object, long y, long m, long d, zval *return_value TSRMLS_DC) +static void php_date_date_set(zval *object, long y, long m, long d, zval *return_value TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); dateobj->time->y = y; dateobj->time->m = m; dateobj->time->d = d; timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_date_set(DateTime object, long year, long month, long day) Sets the date. @@ -3497,25 +3447,25 @@ PHP_FUNCTION(date_date_set) */ PHP_METHOD(DateTimeImmutable, setDate) { - zval *object, *new_object; + zval *object, new_object; long y, m, d; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olll", &object, date_ce_immutable, &y, &m, &d) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_date_set(new_object, y, m, d, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object TSRMLS_CC); + php_date_date_set(&new_object, y, m, d, return_value TSRMLS_CC); - RETURN_ZVAL(new_object, 0, 1); + RETURN_ZVAL(&new_object, 0, 1); } /* }}} */ -static void php_date_isodate_set(zval *object, long y, long w, long d, zval *return_value TSRMLS_DC) +static void php_date_isodate_set(zval *object, long y, long w, long d, zval *return_value TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); dateobj->time->y = y; dateobj->time->m = 1; @@ -3525,7 +3475,7 @@ static void php_date_isodate_set(zval *object, long y, long w, long d, zval *ret dateobj->time->have_relative = 1; timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_isodate_set(DateTime object, long year, long week[, long day]) Sets the ISO date. @@ -3549,29 +3499,29 @@ PHP_FUNCTION(date_isodate_set) */ PHP_METHOD(DateTimeImmutable, setISODate) { - zval *object, *new_object; + zval *object, new_object; long y, w, d = 1; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll|l", &object, date_ce_immutable, &y, &w, &d) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_isodate_set(new_object, y, w, d, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object TSRMLS_CC); + php_date_isodate_set(&new_object, y, w, d, return_value TSRMLS_CC); - RETURN_ZVAL(new_object, 0, 1); + RETURN_ZVAL(&new_object, 0, 1); } /* }}} */ -static void php_date_timestamp_set(zval *object, long timestamp, zval *return_value TSRMLS_DC) +static void php_date_timestamp_set(zval *object, long timestamp, zval *return_value TSRMLS_DC) /* {{{ */ { php_date_obj *dateobj; - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); timelib_unixtime2local(dateobj->time, (timelib_sll)timestamp); timelib_update_ts(dateobj->time, NULL); -} +} /* }}} */ /* {{{ proto DateTime date_timestamp_set(DateTime object, long unixTimestamp) Sets the date and time based on an Unix timestamp. @@ -3595,17 +3545,17 @@ PHP_FUNCTION(date_timestamp_set) */ PHP_METHOD(DateTimeImmutable, setTimestamp) { - zval *object, *new_object; + zval *object, new_object; long timestamp; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &object, date_ce_immutable, ×tamp) == FAILURE) { RETURN_FALSE; } - new_object = date_clone_immutable(object TSRMLS_CC); - php_date_timestamp_set(new_object, timestamp, return_value TSRMLS_CC); + date_clone_immutable(object, &new_object TSRMLS_CC); + php_date_timestamp_set(&new_object, timestamp, return_value TSRMLS_CC); - RETURN_ZVAL(new_object, 0, 1); + RETURN_ZVAL(&new_object, 0, 1); } /* }}} */ @@ -3622,7 +3572,7 @@ PHP_FUNCTION(date_timestamp_get) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_interface) == FAILURE) { RETURN_FALSE; } - dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + dateobj = Z_PHPDATE_P(object); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); timelib_update_ts(dateobj->time, NULL); @@ -3648,15 +3598,15 @@ PHP_FUNCTION(date_diff) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) { RETURN_FALSE; } - dateobj1 = (php_date_obj *) zend_object_store_get_object(object1 TSRMLS_CC); - dateobj2 = (php_date_obj *) zend_object_store_get_object(object2 TSRMLS_CC); + dateobj1 = Z_PHPDATE_P(object1); + dateobj2 = Z_PHPDATE_P(object2); DATE_CHECK_INITIALIZED(dateobj1->time, DateTimeInterface); DATE_CHECK_INITIALIZED(dateobj2->time, DateTimeInterface); timelib_update_ts(dateobj1->time, NULL); timelib_update_ts(dateobj2->time, NULL); php_date_instantiate(date_ce_interval, return_value TSRMLS_CC); - interval = zend_object_store_get_object(return_value TSRMLS_CC); + interval = Z_PHPINTERVAL_P(return_value); interval->diff = timelib_diff(dateobj1->time, dateobj2->time); if (absolute) { interval->diff->invert = 0; @@ -3665,7 +3615,7 @@ PHP_FUNCTION(date_diff) } /* }}} */ -static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRMLS_DC) +static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRMLS_DC) /* {{{ */ { timelib_time *dummy_t = ecalloc(1, sizeof(timelib_time)); int dst, not_found; @@ -3681,7 +3631,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRML efree(dummy_t); return SUCCESS; } -} +} /* }}} */ /* {{{ proto DateTimeZone timezone_open(string timezone) Returns new DateTimeZone object @@ -3695,7 +3645,7 @@ PHP_FUNCTION(timezone_open) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &tz, &tz_len) == FAILURE) { RETURN_FALSE; } - tzobj = zend_object_store_get_object(php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC) TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC)); if (SUCCESS != timezone_initialize(tzobj, tz TSRMLS_CC)) { RETURN_FALSE; } @@ -3714,30 +3664,30 @@ PHP_METHOD(DateTimeZone, __construct) zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &tz, &tz_len)) { - tzobj = zend_object_store_get_object(getThis() TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(getThis()); if (FAILURE == timezone_initialize(tzobj, tz TSRMLS_CC)) { - ZVAL_NULL(getThis()); +//??? ZVAL_NULL(getThis()); } } zend_restore_error_handling(&error_handling TSRMLS_CC); } /* }}} */ -static int php_date_timezone_initialize_from_hash(zval **return_value, php_timezone_obj **tzobj, HashTable *myht TSRMLS_DC) +static int php_date_timezone_initialize_from_hash(zval **return_value, php_timezone_obj **tzobj, HashTable *myht TSRMLS_DC) /* {{{ */ { - zval **z_timezone = NULL; - zval **z_timezone_type = NULL; + zval *z_timezone; + zval *z_timezone_type; - if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS) { - if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) { - convert_to_long(*z_timezone_type); - if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_PP(z_timezone) TSRMLS_CC)) { + if ((z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1)) != NULL) { + if ((z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1)) != NULL) { + convert_to_long(z_timezone_type); + if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_P(z_timezone) TSRMLS_CC)) { return SUCCESS; } } } return FAILURE; -} +} /* }}} */ /* {{{ proto DateTimeZone::__set_state() * */ @@ -3754,7 +3704,7 @@ PHP_METHOD(DateTimeZone, __set_state) myht = HASH_OF(array); php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC); - tzobj = (php_timezone_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(return_value); php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht TSRMLS_CC); } /* }}} */ @@ -3767,7 +3717,7 @@ PHP_METHOD(DateTimeZone, __wakeup) php_timezone_obj *tzobj; HashTable *myht; - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); myht = Z_OBJPROP_P(object); @@ -3786,27 +3736,27 @@ PHP_FUNCTION(timezone_name_get) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); switch (tzobj->type) { case TIMELIB_ZONETYPE_ID: - RETURN_STRING(tzobj->tzi.tz->name, 1); + RETURN_STRING(tzobj->tzi.tz->name); break; case TIMELIB_ZONETYPE_OFFSET: { - char *tmpstr = emalloc(sizeof("UTC+05:00")); + zend_string *tmpstr = STR_ALLOC(sizeof("UTC+05:00")-1, 0); timelib_sll utc_offset = tzobj->tzi.utc_offset; - snprintf(tmpstr, sizeof("+05:00"), "%c%02d:%02d", + tmpstr->len = snprintf(tmpstr->val, sizeof("+05:00"), "%c%02d:%02d", utc_offset > 0 ? '-' : '+', abs(utc_offset / 60), abs((utc_offset % 60))); - RETURN_STRING(tmpstr, 0); + RETURN_STR(tmpstr); } break; case TIMELIB_ZONETYPE_ABBR: - RETURN_STRING(tzobj->tzi.z.abbr, 1); + RETURN_STRING(tzobj->tzi.z.abbr); break; } } @@ -3829,7 +3779,7 @@ PHP_FUNCTION(timezone_name_from_abbr) tzid = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst); if (tzid) { - RETURN_STRING(tzid, 1); + RETURN_STRING(tzid); } else { RETURN_FALSE; } @@ -3849,9 +3799,9 @@ PHP_FUNCTION(timezone_offset_get) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_timezone, &dateobject, date_ce_date) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); - dateobj = (php_date_obj *) zend_object_store_get_object(dateobject TSRMLS_CC); + dateobj = Z_PHPDATE_P(dateobject); DATE_CHECK_INITIALIZED(dateobj->time, DateTime); switch (tzobj->type) { @@ -3875,7 +3825,7 @@ PHP_FUNCTION(timezone_offset_get) */ PHP_FUNCTION(timezone_transitions_get) { - zval *object, *element; + zval *object, element; php_timezone_obj *tzobj; unsigned int i, begin = 0, found; long timestamp_begin = LONG_MIN, timestamp_end = LONG_MAX; @@ -3883,31 +3833,29 @@ PHP_FUNCTION(timezone_transitions_get) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ll", &object, date_ce_timezone, ×tamp_begin, ×tamp_end) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); if (tzobj->type != TIMELIB_ZONETYPE_ID) { RETURN_FALSE; } #define add_nominal() \ - MAKE_STD_ZVAL(element); \ - array_init(element); \ - add_assoc_long(element, "ts", timestamp_begin); \ - add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC), 0); \ - add_assoc_long(element, "offset", tzobj->tzi.tz->type[0].offset); \ - add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[0].isdst); \ - add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx], 1); \ - add_next_index_zval(return_value, element); + array_init(&element); \ + add_assoc_long(&element, "ts", timestamp_begin); \ + add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC)); \ + add_assoc_long(&element, "offset", tzobj->tzi.tz->type[0].offset); \ + add_assoc_bool(&element, "isdst", tzobj->tzi.tz->type[0].isdst); \ + add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[0].abbr_idx]); \ + add_next_index_zval(return_value, &element); #define add(i,ts) \ - MAKE_STD_ZVAL(element); \ - array_init(element); \ - add_assoc_long(element, "ts", ts); \ - add_assoc_string(element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, ts, 0 TSRMLS_CC), 0); \ - add_assoc_long(element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \ - add_assoc_bool(element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \ - add_assoc_string(element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx], 1); \ - add_next_index_zval(return_value, element); + array_init(&element); \ + add_assoc_long(&element, "ts", ts); \ + add_assoc_str(&element, "time", php_format_date(DATE_FORMAT_ISO8601, 13, ts, 0 TSRMLS_CC)); \ + add_assoc_long(&element, "offset", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].offset); \ + add_assoc_bool(&element, "isdst", tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].isdst); \ + add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx]); \ + add_next_index_zval(return_value, &element); #define add_last() add(tzobj->tzi.tz->timecnt - 1, timestamp_begin) @@ -3963,21 +3911,21 @@ PHP_FUNCTION(timezone_location_get) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, date_ce_timezone) == FAILURE) { RETURN_FALSE; } - tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC); + tzobj = Z_PHPTIMEZONE_P(object); DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone); if (tzobj->type != TIMELIB_ZONETYPE_ID) { RETURN_FALSE; } array_init(return_value); - add_assoc_string(return_value, "country_code", tzobj->tzi.tz->location.country_code, 1); + add_assoc_string(return_value, "country_code", tzobj->tzi.tz->location.country_code); add_assoc_double(return_value, "latitude", tzobj->tzi.tz->location.latitude); add_assoc_double(return_value, "longitude", tzobj->tzi.tz->location.longitude); - add_assoc_string(return_value, "comments", tzobj->tzi.tz->location.comments, 1); + add_assoc_string(return_value, "comments", tzobj->tzi.tz->location.comments); } /* }}} */ -static int date_interval_initialize(timelib_rel_time **rt, /*const*/ char *format, int format_length TSRMLS_DC) +static int date_interval_initialize(timelib_rel_time **rt, /*const*/ char *format, int format_length TSRMLS_DC) /* {{{ */ { timelib_time *b = NULL, *e = NULL; timelib_rel_time *p = NULL; @@ -4008,28 +3956,28 @@ static int date_interval_initialize(timelib_rel_time **rt, /*const*/ char *forma } timelib_error_container_dtor(errors); return retval; -} +} /* }}} */ /* {{{ date_interval_read_property */ -zval *date_interval_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +zval *date_interval_read_property(zval *object, zval *member, int type, zend_uint cache_slot, zval *rv TSRMLS_DC) { php_interval_obj *obj; zval *retval; zval tmp_member; timelib_sll value = -1; - if (member->type != IS_STRING) { + if (Z_TYPE_P(member) != IS_STRING) { tmp_member = *member; zval_copy_ctor(&tmp_member); convert_to_string(&tmp_member); member = &tmp_member; - key = NULL; + cache_slot = -1; } - obj = (php_interval_obj *)zend_objects_get_address(object TSRMLS_CC); + obj = Z_PHPINTERVAL_P(object); if (!obj->initialized) { - retval = (zend_get_std_object_handlers())->read_property(object, member, type, key TSRMLS_CC); + retval = (zend_get_std_object_handlers())->read_property(object, member, type, cache_slot, rv TSRMLS_CC); if (member == &tmp_member) { zval_dtor(member); } @@ -4051,7 +3999,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze GET_VALUE_FROM_STRUCT(invert, "invert"); GET_VALUE_FROM_STRUCT(days, "days"); /* didn't find any */ - retval = (zend_get_std_object_handlers())->read_property(object, member, type, key TSRMLS_CC); + retval = (zend_get_std_object_handlers())->read_property(object, member, type, cache_slot, rv TSRMLS_CC); if (member == &tmp_member) { zval_dtor(member); @@ -4060,8 +4008,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze return retval; } while(0); - ALLOC_INIT_ZVAL(retval); - Z_SET_REFCOUNT_P(retval, 0); + retval = rv; if (value != -99999) { ZVAL_LONG(retval, value); @@ -4078,23 +4025,23 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze /* }}} */ /* {{{ date_interval_write_property */ -void date_interval_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +void date_interval_write_property(zval *object, zval *member, zval *value, zend_uint cache_slot TSRMLS_DC) { php_interval_obj *obj; - zval tmp_member, tmp_value; + zval tmp_member; - if (member->type != IS_STRING) { + if (Z_TYPE_P(member) != IS_STRING) { tmp_member = *member; zval_copy_ctor(&tmp_member); convert_to_string(&tmp_member); member = &tmp_member; - key = NULL; + cache_slot = -1; } - obj = (php_interval_obj *)zend_objects_get_address(object TSRMLS_CC); + obj = Z_PHPINTERVAL_P(object); if (!obj->initialized) { - (zend_get_std_object_handlers())->write_property(object, member, value, key TSRMLS_CC); + (zend_get_std_object_handlers())->write_property(object, member, value, cache_slot TSRMLS_CC); if (member == &tmp_member) { zval_dtor(member); } @@ -4103,16 +4050,7 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const #define SET_VALUE_FROM_STRUCT(n,m) \ if (strcmp(Z_STRVAL_P(member), m) == 0) { \ - if (value->type != IS_LONG) { \ - tmp_value = *value; \ - zval_copy_ctor(&tmp_value); \ - convert_to_long(&tmp_value); \ - value = &tmp_value; \ - } \ - obj->diff->n = Z_LVAL_P(value); \ - if (value == &tmp_value) { \ - zval_dtor(value); \ - } \ + obj->diff->n = zval_get_long(value); \ break; \ } @@ -4125,7 +4063,7 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const SET_VALUE_FROM_STRUCT(s, "s"); SET_VALUE_FROM_STRUCT(invert, "invert"); /* didn't find any */ - (zend_get_std_object_handlers())->write_property(object, member, value, key TSRMLS_CC); + (zend_get_std_object_handlers())->write_property(object, member, value, cache_slot TSRMLS_CC); } while(0); if (member == &tmp_member) { @@ -4149,11 +4087,11 @@ PHP_METHOD(DateInterval, __construct) zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &interval_string, &interval_string_length) == SUCCESS) { if (date_interval_initialize(&reltime, interval_string, interval_string_length TSRMLS_CC) == SUCCESS) { - diobj = zend_object_store_get_object(getThis() TSRMLS_CC); + diobj = Z_PHPINTERVAL_P(getThis()); diobj->diff = reltime; diobj->initialized = 1; - } else { - ZVAL_NULL(getThis()); +//??? } else { +//??? ZVAL_NULL(getThis()); } } zend_restore_error_handling(&error_handling TSRMLS_CC); @@ -4161,16 +4099,16 @@ PHP_METHOD(DateInterval, __construct) /* }}} */ -static int php_date_interval_initialize_from_hash(zval **return_value, php_interval_obj **intobj, HashTable *myht TSRMLS_DC) +static int php_date_interval_initialize_from_hash(zval **return_value, php_interval_obj **intobj, HashTable *myht TSRMLS_DC) /* {{{ */ { (*intobj)->diff = timelib_rel_time_ctor(); #define PHP_DATE_INTERVAL_READ_PROPERTY(element, member, itype, def) \ do { \ - zval **z_arg = NULL; \ - if (zend_hash_find(myht, element, strlen(element) + 1, (void**) &z_arg) == SUCCESS) { \ - convert_to_long(*z_arg); \ - (*intobj)->diff->member = (itype)Z_LVAL_PP(z_arg); \ + zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \ + if (z_arg) { \ + convert_to_long(z_arg); \ + (*intobj)->diff->member = (itype)Z_LVAL_P(z_arg); \ } else { \ (*intobj)->diff->member = (itype)def; \ } \ @@ -4178,10 +4116,10 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter #define PHP_DATE_INTERVAL_READ_PROPERTY_I64(element, member) \ do { \ - zval **z_arg = NULL; \ - if (zend_hash_find(myht, element, strlen(element) + 1, (void**) &z_arg) == SUCCESS) { \ - convert_to_string(*z_arg); \ - DATE_A64I((*intobj)->diff->member, Z_STRVAL_PP(z_arg)); \ + zval *z_arg = zend_hash_str_find(myht, element, sizeof(element) - 1); \ + if (z_arg) { \ + convert_to_string(z_arg); \ + DATE_A64I((*intobj)->diff->member, Z_STRVAL_P(z_arg)); \ } else { \ (*intobj)->diff->member = -1LL; \ } \ @@ -4205,7 +4143,7 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter (*intobj)->initialized = 1; return 0; -} +} /* }}} */ /* {{{ proto DateInterval::__set_state() */ @@ -4222,7 +4160,7 @@ PHP_METHOD(DateInterval, __set_state) myht = HASH_OF(array); php_date_instantiate(date_ce_interval, return_value TSRMLS_CC); - intobj = (php_interval_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(return_value); php_date_interval_initialize_from_hash(&return_value, &intobj, myht TSRMLS_CC); } /* }}} */ @@ -4235,13 +4173,14 @@ PHP_METHOD(DateInterval, __wakeup) php_interval_obj *intobj; HashTable *myht; - intobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(object); myht = Z_OBJPROP_P(object); php_date_interval_initialize_from_hash(&return_value, &intobj, myht TSRMLS_CC); } /* }}} */ + /* {{{ proto DateInterval date_interval_create_from_date_string(string time) Uses the normal date parsers and sets up a DateInterval from the relative parts of the parsed string */ @@ -4260,7 +4199,7 @@ PHP_FUNCTION(date_interval_create_from_date_string) php_date_instantiate(date_ce_interval, return_value TSRMLS_CC); time = timelib_strtotime(time_str, time_str_len, &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); - diobj = (php_interval_obj *) zend_object_store_get_object(return_value TSRMLS_CC); + diobj = Z_PHPINTERVAL_P(return_value); diobj->diff = timelib_rel_time_clone(&time->relative); diobj->initialized = 1; timelib_time_dtor(time); @@ -4269,14 +4208,14 @@ PHP_FUNCTION(date_interval_create_from_date_string) /* }}} */ /* {{{ date_interval_format - */ -static char *date_interval_format(char *format, int format_len, timelib_rel_time *t) +static zend_string *date_interval_format(char *format, int format_len, timelib_rel_time *t TSRMLS_DC) { smart_str string = {0}; int i, length, have_format_spec = 0; char buffer[33]; if (!format_len) { - return estrdup(""); + return STR_EMPTY_ALLOC(); } for (i = 0; i < format_len; i++) { @@ -4326,7 +4265,7 @@ static char *date_interval_format(char *format, int format_len, timelib_rel_time smart_str_0(&string); - return string.c; + return string.s; } /* }}} */ @@ -4343,14 +4282,14 @@ PHP_FUNCTION(date_interval_format) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_interval, &format, &format_len) == FAILURE) { RETURN_FALSE; } - diobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC); + diobj = Z_PHPINTERVAL_P(object); DATE_CHECK_INITIALIZED(diobj->initialized, DateInterval); - RETURN_STRING(date_interval_format(format, format_len, diobj->diff), 0); + RETURN_STR(date_interval_format(format, format_len, diobj->diff TSRMLS_CC)); } /* }}} */ -static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, long *recurrences, /*const*/ char *format, int format_length TSRMLS_DC) +static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, long *recurrences, /*const*/ char *format, int format_length TSRMLS_DC) /* {{{ */ { timelib_time *b = NULL, *e = NULL; timelib_rel_time *p = NULL; @@ -4372,7 +4311,7 @@ static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_ } timelib_error_container_dtor(errors); return retval; -} +} /* }}} */ /* {{{ proto DatePeriod::__construct(DateTime $start, DateInterval $interval, int recurrences|DateTime $end) Creates new DatePeriod object. @@ -4400,7 +4339,7 @@ PHP_METHOD(DatePeriod, __construct) } } - dpobj = zend_object_store_get_object(getThis() TSRMLS_CC); + dpobj = Z_PHPPERIOD_P(getThis()); dpobj->current = NULL; if (isostr) { @@ -4424,10 +4363,10 @@ PHP_METHOD(DatePeriod, __construct) dpobj->start_ce = date_ce_date; } else { /* init */ - intobj = (php_interval_obj *) zend_object_store_get_object(interval TSRMLS_CC); + intobj = Z_PHPINTERVAL_P(interval); /* start date */ - dateobj = (php_date_obj *) zend_object_store_get_object(start TSRMLS_CC); + dateobj = Z_PHPDATE_P(start); clone = timelib_time_ctor(); memcpy(clone, dateobj->time, sizeof(timelib_time)); if (dateobj->time->tz_abbr) { @@ -4444,7 +4383,7 @@ PHP_METHOD(DatePeriod, __construct) /* end date */ if (end) { - dateobj = (php_date_obj *) zend_object_store_get_object(end TSRMLS_CC); + dateobj = Z_PHPDATE_P(end); clone = timelib_time_clone(dateobj->time); dpobj->end = clone; } @@ -4462,7 +4401,7 @@ PHP_METHOD(DatePeriod, __construct) } /* }}} */ -static int check_id_allowed(char *id, long what) +static int check_id_allowed(char *id, long what) /* {{{ */ { if (what & PHP_DATE_TIMEZONE_GROUP_AFRICA && strncasecmp(id, "Africa/", 7) == 0) return 1; if (what & PHP_DATE_TIMEZONE_GROUP_AMERICA && strncasecmp(id, "America/", 8) == 0) return 1; @@ -4476,7 +4415,7 @@ static int check_id_allowed(char *id, long what) if (what & PHP_DATE_TIMEZONE_GROUP_PACIFIC && strncasecmp(id, "Pacific/", 8) == 0) return 1; if (what & PHP_DATE_TIMEZONE_GROUP_UTC && strncasecmp(id, "UTC", 3) == 0) return 1; return 0; -} +} /* }}} */ /* {{{ proto array timezone_identifiers_list([long what[, string country]]) Returns numerically index array with all timezone identifiers. @@ -4509,10 +4448,10 @@ PHP_FUNCTION(timezone_identifiers_list) for (i = 0; i < item_count; ++i) { if (what == PHP_DATE_TIMEZONE_PER_COUNTRY) { if (tzdb->data[table[i].pos + 5] == option[0] && tzdb->data[table[i].pos + 6] == option[1]) { - add_next_index_string(return_value, table[i].id, 1); + add_next_index_string(return_value, table[i].id); } } else if (what == PHP_DATE_TIMEZONE_GROUP_ALL_W_BC || (check_id_allowed(table[i].id, what) && (tzdb->data[table[i].pos + 4] == '\1'))) { - add_next_index_string(return_value, table[i].id, 1); + add_next_index_string(return_value, table[i].id); } }; } @@ -4526,7 +4465,7 @@ PHP_FUNCTION(timezone_version_get) const timelib_tzdb *tzdb; tzdb = DATE_TIMEZONEDB; - RETURN_STRING(tzdb->version, 1); + RETURN_STRING(tzdb->version); } /* }}} */ @@ -4536,31 +4475,30 @@ PHP_FUNCTION(timezone_version_get) PHP_FUNCTION(timezone_abbreviations_list) { const timelib_tz_lookup_table *table, *entry; - zval *element, **abbr_array_pp, *abbr_array; + zval element, *abbr_array_p, abbr_array; table = timelib_timezone_abbreviations_list(); array_init(return_value); entry = table; do { - MAKE_STD_ZVAL(element); - array_init(element); - add_assoc_bool(element, "dst", entry->type); - add_assoc_long(element, "offset", entry->gmtoffset); + array_init(&element); + add_assoc_bool(&element, "dst", entry->type); + add_assoc_long(&element, "offset", entry->gmtoffset); if (entry->full_tz_name) { - add_assoc_string(element, "timezone_id", entry->full_tz_name, 1); + add_assoc_string(&element, "timezone_id", entry->full_tz_name); } else { - add_assoc_null(element, "timezone_id"); + add_assoc_null(&element, "timezone_id"); } - if (zend_hash_find(HASH_OF(return_value), entry->name, strlen(entry->name) + 1, (void **) &abbr_array_pp) == FAILURE) { - MAKE_STD_ZVAL(abbr_array); - array_init(abbr_array); - add_assoc_zval(return_value, entry->name, abbr_array); + abbr_array_p = zend_hash_str_find(HASH_OF(return_value), entry->name, strlen(entry->name)); + if (!abbr_array_p) { + array_init(&abbr_array); + add_assoc_zval(return_value, entry->name, &abbr_array); } else { - abbr_array = *abbr_array_pp; + ZVAL_COPY_VALUE(&abbr_array, abbr_array_p); } - add_next_index_zval(abbr_array, element); + add_next_index_zval(&abbr_array, &element); entry++; } while (entry->name); } @@ -4596,7 +4534,7 @@ PHP_FUNCTION(date_default_timezone_get) timelib_tzinfo *default_tz; default_tz = get_timezone_info(TSRMLS_C); - RETVAL_STRING(default_tz->name, 1); + RETVAL_STRING(default_tz->name); } /* }}} */ @@ -4678,7 +4616,10 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su switch (retformat) { case SUNFUNCS_RET_STRING: spprintf(&retstr, 0, "%02d:%02d", (int) N, (int) (60 * (N - (int) N))); - RETURN_STRINGL(retstr, 5, 0); + // TODO: avoid reallocation ??? + RETVAL_STRINGL(retstr, 5); + efree(retstr); + return; break; case SUNFUNCS_RET_DOUBLE: RETURN_DOUBLE(N); @@ -4808,20 +4749,20 @@ PHP_FUNCTION(date_sun_info) } /* }}} */ -static HashTable *date_object_get_gc_period(zval *object, zval ***table, int *n TSRMLS_DC) +static HashTable *date_object_get_gc_period(zval *object, zval **table, int *n TSRMLS_DC) /* {{{ */ { *table = NULL; *n = 0; return zend_std_get_properties(object TSRMLS_CC); -} +} /* }}} */ -static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC) +static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC) /* {{{ */ { HashTable *props; - zval *zv; + zval zv; php_period_obj *period_obj; - period_obj = zend_object_store_get_object(object TSRMLS_CC); + period_obj = Z_PHPPERIOD_P(object); props = zend_std_get_properties(object TSRMLS_CC); @@ -4829,110 +4770,108 @@ static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC) return props; } - MAKE_STD_ZVAL(zv); if (period_obj->start) { php_date_obj *date_obj; - object_init_ex(zv, date_ce_date); - date_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_date); + date_obj = Z_PHPDATE_P(&zv); date_obj->time = timelib_time_clone(period_obj->start); } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "start", sizeof("start"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "start", sizeof("start")-1, &zv); - MAKE_STD_ZVAL(zv); if (period_obj->current) { php_date_obj *date_obj; - object_init_ex(zv, date_ce_date); - date_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_date); + date_obj = Z_PHPDATE_P(&zv); date_obj->time = timelib_time_clone(period_obj->current); } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "current", sizeof("current"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "current", sizeof("current")-1, &zv); - MAKE_STD_ZVAL(zv); if (period_obj->end) { php_date_obj *date_obj; - object_init_ex(zv, date_ce_date); - date_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_date); + date_obj = Z_PHPDATE_P(&zv); date_obj->time = timelib_time_clone(period_obj->end); } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "end", sizeof("end"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "end", sizeof("end")-1, &zv); - MAKE_STD_ZVAL(zv); if (period_obj->interval) { php_interval_obj *interval_obj; - object_init_ex(zv, date_ce_interval); - interval_obj = zend_object_store_get_object(zv TSRMLS_CC); + object_init_ex(&zv, date_ce_interval); + interval_obj = Z_PHPINTERVAL_P(&zv); interval_obj->diff = timelib_rel_time_clone(period_obj->interval); interval_obj->initialized = 1; } else { - ZVAL_NULL(zv); + ZVAL_NULL(&zv); } - zend_hash_update(props, "interval", sizeof("interval"), &zv, sizeof(zv), NULL); + zend_hash_str_update(props, "interval", sizeof("interval")-1, &zv); /* converted to larger type (int->long); must check when unserializing */ - MAKE_STD_ZVAL(zv); - ZVAL_LONG(zv, (long) period_obj->recurrences); - zend_hash_update(props, "recurrences", sizeof("recurrences"), &zv, sizeof(zv), NULL); + ZVAL_LONG(&zv, (long) period_obj->recurrences); + zend_hash_str_update(props, "recurrences", sizeof("recurrences")-1, &zv); - MAKE_STD_ZVAL(zv); - ZVAL_BOOL(zv, period_obj->include_start_date); - zend_hash_update(props, "include_start_date", sizeof("include_start_date"), &zv, sizeof(zv), NULL); + ZVAL_BOOL(&zv, period_obj->include_start_date); + zend_hash_str_update(props, "include_start_date", sizeof("include_start_date")-1, &zv); return props; -} +} /* }}} */ -static int php_date_period_initialize_from_hash(php_period_obj *period_obj, HashTable *myht TSRMLS_DC) +static int php_date_period_initialize_from_hash(php_period_obj *period_obj, HashTable *myht TSRMLS_DC) /* {{{ */ { - zval **ht_entry; + zval *ht_entry; /* this function does no rollback on error */ - if (zend_hash_find(myht, "start", sizeof("start"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) { + ht_entry = zend_hash_str_find(myht, "start", sizeof("start")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) { php_date_obj *date_obj; - date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + date_obj = Z_PHPDATE_P(ht_entry); period_obj->start = timelib_time_clone(date_obj->time); - period_obj->start_ce = Z_OBJCE_PP(ht_entry); - } else if (Z_TYPE_PP(ht_entry) != IS_NULL) { + period_obj->start_ce = Z_OBJCE_P(ht_entry); + } else if (Z_TYPE_P(ht_entry) != IS_NULL) { return 0; } } else { return 0; } - if (zend_hash_find(myht, "end", sizeof("end"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) { + ht_entry = zend_hash_str_find(myht, "end", sizeof("end")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) { php_date_obj *date_obj; - date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + date_obj = Z_PHPDATE_P(ht_entry); period_obj->end = timelib_time_clone(date_obj->time); - } else if (Z_TYPE_PP(ht_entry) != IS_NULL) { + } else if (Z_TYPE_P(ht_entry) != IS_NULL) { return 0; } } else { return 0; } - if (zend_hash_find(myht, "current", sizeof("current"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) { + ht_entry = zend_hash_str_find(myht, "current", sizeof("current")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_date) { php_date_obj *date_obj; - date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + date_obj = Z_PHPDATE_P(ht_entry); period_obj->current = timelib_time_clone(date_obj->time); - } else if (Z_TYPE_PP(ht_entry) != IS_NULL) { + } else if (Z_TYPE_P(ht_entry) != IS_NULL) { return 0; } } else { return 0; } - if (zend_hash_find(myht, "interval", sizeof("interval"), (void**) &ht_entry) == SUCCESS) { - if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_interval) { + ht_entry = zend_hash_str_find(myht, "interval", sizeof("interval")-1); + if (ht_entry) { + if (Z_TYPE_P(ht_entry) == IS_OBJECT && Z_OBJCE_P(ht_entry) == date_ce_interval) { php_interval_obj *interval_obj; - interval_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC); + interval_obj = Z_PHPINTERVAL_P(ht_entry); period_obj->interval = timelib_rel_time_clone(interval_obj->diff); } else { /* interval is required */ return 0; @@ -4941,16 +4880,18 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash return 0; } - if (zend_hash_find(myht, "recurrences", sizeof("recurrences"), (void**) &ht_entry) == SUCCESS && - Z_TYPE_PP(ht_entry) == IS_LONG && Z_LVAL_PP(ht_entry) >= 0 && Z_LVAL_PP(ht_entry) <= INT_MAX) { - period_obj->recurrences = Z_LVAL_PP(ht_entry); + ht_entry = zend_hash_str_find(myht, "recurrences", sizeof("recurrences")-1); + if (ht_entry && + Z_TYPE_P(ht_entry) == IS_LONG && Z_LVAL_P(ht_entry) >= 0 && Z_LVAL_P(ht_entry) <= INT_MAX) { + period_obj->recurrences = Z_LVAL_P(ht_entry); } else { return 0; } - if (zend_hash_find(myht, "include_start_date", sizeof("include_start_date"), (void**) &ht_entry) == SUCCESS && - Z_TYPE_PP(ht_entry) == IS_BOOL) { - period_obj->include_start_date = Z_BVAL_PP(ht_entry); + ht_entry = zend_hash_str_find(myht, "include_start_date", sizeof("include_start_date")-1); + if (ht_entry && + (Z_TYPE_P(ht_entry) == IS_FALSE || Z_TYPE_P(ht_entry) == IS_TRUE)) { + period_obj->include_start_date = (Z_TYPE_P(ht_entry) == IS_TRUE); } else { return 0; } @@ -4958,7 +4899,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash period_obj->initialized = 1; return 1; -} +} /* }}} */ /* {{{ proto DatePeriod::__set_state() */ @@ -4975,7 +4916,7 @@ PHP_METHOD(DatePeriod, __set_state) myht = Z_ARRVAL_P(array); object_init_ex(return_value, date_ce_period); - period_obj = zend_object_store_get_object(return_value TSRMLS_CC); + period_obj = Z_PHPPERIOD_P(return_value); if (!php_date_period_initialize_from_hash(period_obj, myht TSRMLS_CC)) { php_error(E_ERROR, "Invalid serialization data for DatePeriod object"); } @@ -4990,7 +4931,7 @@ PHP_METHOD(DatePeriod, __wakeup) php_period_obj *period_obj; HashTable *myht; - period_obj = zend_object_store_get_object(object TSRMLS_CC); + period_obj = Z_PHPPERIOD_P(object); myht = Z_OBJPROP_P(object); @@ -5001,7 +4942,7 @@ PHP_METHOD(DatePeriod, __wakeup) /* }}} */ /* {{{ date_period_read_property */ -static zval *date_period_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +static zval *date_period_read_property(zval *object, zval *member, int type, zend_uint cache_slot, zval *rv TSRMLS_DC) { zval *zv; if (type != BP_VAR_IS && type != BP_VAR_R) { @@ -5010,13 +4951,10 @@ static zval *date_period_read_property(zval *object, zval *member, int type, con Z_OBJPROP_P(object); /* build properties hash table */ - zv = std_object_handlers.read_property(object, member, type, key TSRMLS_CC); + zv = std_object_handlers.read_property(object, member, type, cache_slot, rv TSRMLS_CC); if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) { /* defensive copy */ - zend_object_value zov = Z_OBJ_HANDLER_P(zv, clone_obj)(zv TSRMLS_CC); - MAKE_STD_ZVAL(zv); - Z_TYPE_P(zv) = IS_OBJECT; - Z_OBJVAL_P(zv) = zov; + ZVAL_OBJ(zv, Z_OBJ_HANDLER_P(zv, clone_obj)(zv TSRMLS_CC)); } return zv; @@ -5024,13 +4962,12 @@ static zval *date_period_read_property(zval *object, zval *member, int type, con /* }}} */ /* {{{ date_period_write_property */ -static void date_period_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +static void date_period_write_property(zval *object, zval *member, zval *value, zend_uint cache_slot TSRMLS_DC) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Writing to DatePeriod properties is unsupported"); } /* }}} */ - /* * Local variables: * tab-width: 4 |