summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--util.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e00d87f..5683970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 17 14:10:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * util.c (ruby_add_suffix): fixed type warnings.
+
Sat Jul 17 13:48:22 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/lib/pathname.rb: moved from lib/pathname.rb.
diff --git a/util.c b/util.c
index 3685586..363868d 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) {