From f64e076260cf60b25d78dcfe157c3b4e8c704ce5 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 12 May 2009 12:07:49 +0000 Subject: * time.c: support fixed UTC offset. [ruby-dev:38326] (leap_year_v_p): new macro. (TIME_FIXOFF_P): new macro. (TIME_SET_FIXOFF): new macro. (time_init_0): renamed from time_init. (time_set_utc_offset): new function. (vtm_add_offset): new function. (utc_offset_arg): new function. (time_init_1): new function. (time_init): call time_init_0 or time_init_1 according argc. (validate_utc_offset): new function. (time_localtime_m): new function. (time_fixoff): new function. (time_getlocaltime): take optional UTC offset argument. (time_get_tm): support fixed UTC offset time. (Init_Time): make Time#{initialize,localtime,getlocal} varargs. * strftime.c (rb_strftime): vtm->zone can be NULL now. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- strftime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'strftime.c') diff --git a/strftime.c b/strftime.c index 3727bc40ea..076822742b 100644 --- a/strftime.c +++ b/strftime.c @@ -610,7 +610,10 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct vtm *vtm, #endif /* HAVE_TM_ZONE */ #endif /* HAVE_TZNAME */ #endif /* 0 */ - tp = vtm->zone; + if (vtm->zone == NULL) + tp = ""; + else + tp = vtm->zone; i = strlen(tp); break; -- cgit v1.2.3