diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-23 17:34:55 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-23 17:34:55 +0000 |
| commit | c34db589139980914f0b05d27b2499ac5bec615a (patch) | |
| tree | 35dca0b96c3e330eb7ef06c83ed2f7703c4e6d37 | |
| parent | 5c0a69a6211c76d0e34be9adb24e89ee539f4cba (diff) | |
* ext/date/date_core.c (leap_p): surpress warning: parentheses.
* ext/date/date_core.c (date_s__parse_internal): remove unused
variable "str".
* ext/date/date_parse.c (parse_ddd_cb): use RSTRING_LENINT.
* ext/date/date_strftime.c (date_strftime_with_tmx): remove unused
variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ext/date/date_core.c | 4 | ||||
| -rw-r--r-- | ext/date/date_parse.c | 10 | ||||
| -rw-r--r-- | ext/date/date_strftime.c | 6 |
4 files changed, 20 insertions, 12 deletions
@@ -1,3 +1,15 @@ +Sun Apr 24 01:58:01 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/date/date_core.c (leap_p): surpress warning: parentheses. + + * ext/date/date_core.c (date_s__parse_internal): remove unused + variable "str". + + * ext/date/date_parse.c (parse_ddd_cb): use RSTRING_LENINT. + + * ext/date/date_strftime.c (date_strftime_with_tmx): remove unused + variable. + Sun Apr 24 00:34:23 2011 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_parse.c: removed some unused macros. use strchr() diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 52a1b38eae..9a240a0106 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -440,7 +440,7 @@ static const int monthtab[2][13] = { inline static int leap_p(int y) { - return MOD(y, 4) == 0 && y % 100 != 0 || MOD(y, 400) == 0; + return (MOD(y, 4) == 0 && y % 100 != 0) || (MOD(y, 400) == 0); } static int @@ -1434,14 +1434,12 @@ static VALUE date_s__parse_internal(int argc, VALUE *argv, VALUE klass) { VALUE vstr, vcomp, hash; - const char *str; rb_scan_args(argc, argv, "11", &vstr, &vcomp); StringValue(vstr); if (!rb_enc_str_asciicompat_p(vstr)) rb_raise(rb_eArgError, "string should have ASCII compatible encoding"); - str = RSTRING_PTR(vstr); if (argc < 2) vcomp = Qtrue; diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c index fd1dd654d0..452709309f 100644 --- a/ext/date/date_parse.c +++ b/ext/date/date_parse.c @@ -918,7 +918,7 @@ parse_ddd_cb(VALUE m, VALUE hash) { VALUE s1, s2, s3, s4, s5; const char *cs2, *cs3, *cs5; - long l2, l3, l4, l5; + int l2, l3, l4, l5; s1 = f_aref(m, INT2FIX(1)); s2 = f_aref(m, INT2FIX(2)); @@ -927,7 +927,7 @@ parse_ddd_cb(VALUE m, VALUE hash) s5 = f_aref(m, INT2FIX(5)); cs2 = RSTRING_PTR(s2); - l2 = RSTRING_LEN(s2); + l2 = RSTRING_LENINT(s2); switch (l2) { case 2: @@ -1042,7 +1042,7 @@ parse_ddd_cb(VALUE m, VALUE hash) } if (!NIL_P(s3)) { cs3 = RSTRING_PTR(s3); - l3 = RSTRING_LEN(s3); + l3 = RSTRING_LENINT(s3); if (!NIL_P(s4)) { switch (l3) { @@ -1072,7 +1072,7 @@ parse_ddd_cb(VALUE m, VALUE hash) } } if (!NIL_P(s4)) { - l4 = RSTRING_LEN(s4); + l4 = RSTRING_LENINT(s4); set_hash("sec_fraction", rb_rational_new2(str2num(s4), @@ -1081,7 +1081,7 @@ parse_ddd_cb(VALUE m, VALUE hash) if (!NIL_P(s5)) { VALUE zone_to_diff(VALUE s); cs5 = RSTRING_PTR(s5); - l5 = RSTRING_LEN(s5); + l5 = RSTRING_LENINT(s5); set_hash("zone", s5); diff --git a/ext/date/date_strftime.c b/ext/date/date_strftime.c index 5bb84a1c2b..2b20f310f9 100644 --- a/ext/date/date_strftime.c +++ b/ext/date/date_strftime.c @@ -716,17 +716,15 @@ date_strftime_with_tmx(char *s, size_t maxsize, const char *format, subsec = div(subsec, INT2FIX(1)); if (FIXNUM_P(subsec)) { - int l; - l = snprintf(s, endp - s, "%0*ld", precision, FIX2LONG(subsec)); + (void)snprintf(s, endp - s, "%0*ld", precision, FIX2LONG(subsec)); s += precision; } else { VALUE args[2], result; - size_t l; args[0] = INT2FIX(precision); args[1] = subsec; result = rb_str_format(2, args, rb_str_new2("%0*d")); - l = strlcpy(s, StringValueCStr(result), endp-s); + (void)strlcpy(s, StringValueCStr(result), endp-s); s += precision; } } |