summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-26 15:57:26 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-26 15:57:26 +0000
commit0861cbd901155d609fe39a9b2446afb91f46e3ca (patch)
treea1bbee0e676613f0b0220b96c065d9b857aeac80 /ext
parent19de515b93dd9aa9f4a17bd6d87d6f14d85606f3 (diff)
* array.c, class.c, eval.c, file.c, gc.c, node.h, numeric.c,
object.c, parse.y, range.c, re.c, string.c, struct.c, util.c, ext/socket/socket.c: merge from 1.7: treat long values as long instead of int. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 33be479eb1..a0501fd94e 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -815,7 +815,7 @@ open_inet_internal(arg)
else {
Check_SafeStr(arg->serv);
if (RSTRING(arg->serv)->len >= sizeof(pbuf))
- rb_raise(rb_eArgError, "servicename too long (%d)", RSTRING(arg->serv)->len);
+ rb_raise(rb_eArgError, "servicename too long (%ld)", RSTRING(arg->serv)->len);
strcpy(pbuf, RSTRING(arg->serv)->ptr);
portp = pbuf;
}
@@ -1981,7 +1981,7 @@ sock_s_getnameinfo(argc, argv)
}
}
else {
- rb_raise(rb_eArgError, "array size should be 3 or 4, %d given",
+ rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
RARRAY(sa)->len);
}
/* host */