cvs: php-src /ext/date/lib datetime.c

derick Wed Jun 15 03:15:39 2005 EDT Modified files: /php-src/ext/date/lib datetime.c Log: - Rename macro to TIMELIB_TIME_FREE #- Please do not use PHP_ prefixes as this library will also be packaged # outside of PHP. http://cvs.php.net/diff.php/php-src/ext/date/lib/datetime.c?r1=1.2&r2=1.3&ty=u Index: php-src/ext/date/lib/datetime.c diff -u php-src/ext/date/lib/datetime.c:1.2 php-src/ext/date/lib/datetime.c:1.3 --- php-src/ext/date/lib/datetime.c:1.2 Tue Jun 14 19:40:57 2005 +++ php-src/ext/date/lib/datetime.c Wed Jun 15 03:15:38 2005 @@ -16,13 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: datetime.c,v 1.2 2005/06/14 23:40:57 iliaa Exp $ */ +/* $Id: datetime.c,v 1.3 2005/06/15 07:15:38 derick Exp $ */ #include "timelib_structs.h" #include "datetime.h" #include <ctype.h> -#define PHP_TIME_FREE(m) \ +#define TIMELIB_TIME_FREE(m) \ if (m) { \ free(m); \ m = NULL; \ @@ -40,7 +40,7 @@ { int i; - PHP_TIME_FREE(tm->tz_abbr); + TIMELIB_TIME_FREE(tm->tz_abbr); tm->tz_abbr = strdup(tz_abbr); for (i = 0; i < strlen(tz_abbr); i++) { tm->tz_abbr[i] = toupper(tz_abbr[i]); @@ -49,12 +49,12 @@ void timelib_time_dtor(timelib_time* t) { - PHP_TIME_FREE(t->tz_abbr); + TIMELIB_TIME_FREE(t->tz_abbr); if (t->tz_info) { timelib_tzinfo_dtor(t->tz_info); t->tz_info = NULL; } - PHP_TIME_FREE(t); + TIMELIB_TIME_FREE(t); } timelib_time_offset* timelib_time_offset_ctor() @@ -67,8 +67,8 @@ void timelib_time_offset_dtor(timelib_time_offset* t) { - PHP_TIME_FREE(t->abbr); - PHP_TIME_FREE(t); + TIMELIB_TIME_FREE(t->abbr); + TIMELIB_TIME_FREE(t); } timelib_tzinfo* timelib_tzinfo_ctor(char *name) @@ -109,13 +109,13 @@ void timelib_tzinfo_dtor(timelib_tzinfo *tz) { - PHP_TIME_FREE(tz->name); - PHP_TIME_FREE(tz->trans); - PHP_TIME_FREE(tz->trans_idx); - PHP_TIME_FREE(tz->type); - PHP_TIME_FREE(tz->timezone_abbr); - PHP_TIME_FREE(tz->leap_times); - PHP_TIME_FREE(tz); + TIMELIB_TIME_FREE(tz->name); + TIMELIB_TIME_FREE(tz->trans); + TIMELIB_TIME_FREE(tz->trans_idx); + TIMELIB_TIME_FREE(tz->type); + TIMELIB_TIME_FREE(tz->timezone_abbr); + TIMELIB_TIME_FREE(tz->leap_times); + TIMELIB_TIME_FREE(tz); } char *timelib_get_tz_abbr_ptr(timelib_time *t)