From e4820b1cfadbd7cbd5713d774a0bc0db527e479d Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 17 Jul 2010 05:10:22 +0000 Subject: [PATCH] * util.c (ruby_add_suffix): fixed type warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ util.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e00d87f98c..5683970e96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Jul 17 14:10:20 2010 Nobuyoshi Nakada + + * util.c (ruby_add_suffix): fixed type warnings. + Sat Jul 17 13:48:22 2010 Tanaka Akira * ext/pathname/lib/pathname.rb: moved from lib/pathname.rb. diff --git a/util.c b/util.c index 368558607f..363868dbc4 100644 --- a/util.c +++ b/util.c @@ -266,9 +266,8 @@ extern const char *ruby_find_extname(const char *, long *); void ruby_add_suffix(VALUE str, const char *suffix) { - int baselen; - int extlen = strlen(suffix); - char *p, *q; + long baselen; + long extlen = strlen(suffix); long slen; char buf[1024]; const char *name; @@ -299,11 +298,12 @@ ruby_add_suffix(VALUE str, const char *suffix) rb_str_cat(str, suffix, extlen); } else { + char *p = buf, *q; strncpy(buf, name, slen); if (ext) - p = buf + (ext - name); + p += (ext - name); else - p = buf + slen; + p += slen; p[len] = '\0'; if (suffix[1] == '\0') { /* Style 2 */ if (len <= 3) {