kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

time.c: refine error message

Browse source 
* time.c (validate_vtm): separate validation failure messages for
  each members.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-19 08:36:21 +00:00
parent 528f870e14
commit 5064e9201a
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
time.c
View file

@ -2514,15 +2514,18 @@ validate_zone_name(VALUE zone_name)
static void
validate_vtm(struct vtm *vtm)
{
if ( vtm->mon < 1 || vtm->mon > 12
|| vtm->mday < 1 || vtm->mday > 31
|| vtm->hour < 0 || vtm->hour > 24
|| (vtm->hour == 24 && (vtm->min > 0 || vtm->sec > 0))
|| vtm->min < 0 || vtm->min > 59
|| vtm->sec < 0 || vtm->sec > 60
|| lt(vtm->subsecx, INT2FIX(0)) || ge(vtm->subsecx, INT2FIX(TIME_SCALE))
|| (!NIL_P(vtm->utc_offset) && (validate_utc_offset(vtm->utc_offset), 0)))
rb_raise(rb_eArgError, "argument out of range");
#define validate_vtm_range(mem, b, e) \
((vtm->mem < b || vtm->mem > e) ? \
rb_raise(rb_eArgError, #mem" out of range") : (void)0)
validate_vtm_range(mon, 1, 12);
validate_vtm_range(mday, 1, 31);
validate_vtm_range(hour, 0, 24);
validate_vtm_range(min, 0, (vtm->hour == 24 ? 0 : 59));
validate_vtm_range(sec, 0, (vtm->hour == 24 ? 0 : 60));
if (lt(vtm->subsecx, INT2FIX(0)) || ge(vtm->subsecx, INT2FIX(TIME_SCALE)))
rb_raise(rb_eArgError, "subsecx out of range");
if (!NIL_P(vtm->utc_offset)) validate_utc_offset(vtm->utc_offset);
#undef validate_vtm_range
}
static void