diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-24 06:10:49 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-24 06:10:49 +0000 |
commit | 4eca4cadff0ff6ee1931ab8d7653cdad65e2cac6 (patch) | |
tree | f37df887a67678e5de4ba4a2db48da5d47f448c2 | |
parent | 968e404220762d5adfc04b8c030c6f186cb47c0e (diff) | |
download | ruby-4eca4cadff0ff6ee1931ab8d7653cdad65e2cac6.tar.gz |
* time.c (make_time_t): revert round trip test. [ruby-dev:33058]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | time.c | 29 |
2 files changed, 20 insertions, 13 deletions
@@ -1,3 +1,7 @@ +Thu Jan 24 15:09:40 2008 Tanaka Akira <akr@fsij.org> + + * time.c (make_time_t): revert round trip test. [ruby-dev:33058] + Thu Jan 24 11:14:56 2008 Tanaka Akira <akr@fsij.org> * string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is @@ -825,37 +825,40 @@ make_time_t(struct tm *tptr, int utc_p) buf = *tptr; if (utc_p) { #if defined(HAVE_TIMEGM) - t = timegm(&buf); - if (t == (time_t)-1) -#endif - t = search_time_t(&buf, utc_p); + if ((t = timegm(&buf)) != -1) + return t; +#ifdef NEGATIVE_TIME_T if ((tmp = gmtime(&t)) && tptr->tm_year == tmp->tm_year && tptr->tm_mon == tmp->tm_mon && tptr->tm_mday == tmp->tm_mday && tptr->tm_hour == tmp->tm_hour && tptr->tm_min == tmp->tm_min && - tptr->tm_sec == tmp->tm_sec) { + tptr->tm_sec == tmp->tm_sec + ) return t; - } +#endif +#endif + return search_time_t(&buf, utc_p); } else { #if defined(HAVE_MKTIME) - t = mktime(&buf); - if (t == (time_t)-1) -#endif - t = search_time_t(&buf, utc_p); + if ((t = mktime(&buf)) != -1) + return t; +#ifdef NEGATIVE_TIME_T if ((tmp = localtime(&t)) && tptr->tm_year == tmp->tm_year && tptr->tm_mon == tmp->tm_mon && tptr->tm_mday == tmp->tm_mday && tptr->tm_hour == tmp->tm_hour && tptr->tm_min == tmp->tm_min && - tptr->tm_sec == tmp->tm_sec) { + tptr->tm_sec == tmp->tm_sec + ) return t; - } +#endif +#endif + return search_time_t(&buf, utc_p); } - rb_raise(rb_eArgError, "couldn't generate a time"); } static VALUE |