cvs: php-src /ext/date/lib tm2unixtime.c unixtime2tm.c

derick Fri Jun 17 10:11:13 2005 EDT Modified files: /php-src/ext/date/lib tm2unixtime.c unixtime2tm.c Log: - Simplify code a little. http://cvs.php.net/diff.php/php-src/ext/date/lib/tm2unixtime.c?r1=1.7&r2=1.8&ty=u Index: php-src/ext/date/lib/tm2unixtime.c diff -u php-src/ext/date/lib/tm2unixtime.c:1.7 php-src/ext/date/lib/tm2unixtime.c:1.8 --- php-src/ext/date/lib/tm2unixtime.c:1.7 Fri Jun 17 08:03:03 2005 +++ php-src/ext/date/lib/tm2unixtime.c Fri Jun 17 10:11:12 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tm2unixtime.c,v 1.7 2005/06/17 12:03:03 derick Exp $ */ +/* $Id: tm2unixtime.c,v 1.8 2005/06/17 14:11:12 derick Exp $ */ #include <timelib_config.h> #include "timelib.h" @@ -202,11 +202,8 @@ break; case TIMELIB_ZONETYPE_ID: - tz->is_localtime = 1; - timelib_set_timezone(tz, tz->tz_info); - return -tz->z; - - break; + tzi = tz->tz_info; + /* Break intentionally missing */ default: /* No timezone in struct, fallback to reference if possible */ http://cvs.php.net/diff.php/php-src/ext/date/lib/unixtime2tm.c?r1=1.6&r2=1.7&ty=u Index: php-src/ext/date/lib/unixtime2tm.c diff -u php-src/ext/date/lib/unixtime2tm.c:1.6 php-src/ext/date/lib/unixtime2tm.c:1.7 --- php-src/ext/date/lib/unixtime2tm.c:1.6 Fri Jun 17 08:03:03 2005 +++ php-src/ext/date/lib/unixtime2tm.c Fri Jun 17 10:11:12 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: unixtime2tm.c,v 1.6 2005/06/17 12:03:03 derick Exp $ */ +/* $Id: unixtime2tm.c,v 1.7 2005/06/17 14:11:12 derick Exp $ */ #include <timelib_config.h> @@ -132,6 +132,7 @@ gmt_offset = timelib_get_time_zone_info(ts, tz); timelib_unixtime2gmt(tm, ts + gmt_offset->offset); + /* we need to reset the sse here as unixtime2gmt modifies it */ tm->sse = ts; tm->dst = gmt_offset->is_dst;