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

* ext/socket/socket.c (host_str): fix type mismatch in rb_raise

Browse source 
format and argument.
  (port_str): ditto.
  (unix_recv_io): ditto.
  (sock_s_unpack_sockaddr_un): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-07-05 15:58:46 +00:00
parent d375b77352
commit 890aa092be
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Jul 6 00:56:51 2008 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (host_str): fix type mismatch in rb_raise
format and argument.
(port_str): ditto.
(unix_recv_io): ditto.
(sock_s_unpack_sockaddr_un): ditto.
Sat Jul 5 23:42:23 2008 Tanaka Akira <akr@fsij.org> Sat Jul 5 23:42:23 2008 Tanaka Akira <akr@fsij.org>
* include/ruby/ruby.h (NUM2INT): cast to int. * include/ruby/ruby.h (NUM2INT): cast to int.

14
ext/socket/socket.c
View file

@ -850,7 +850,8 @@ host_str(VALUE host, char *hbuf, size_t len)
make_inetaddr(INADDR_BROADCAST, hbuf, len); make_inetaddr(INADDR_BROADCAST, hbuf, len);
} }
else if (strlen(name) >= len) { else if (strlen(name) >= len) {
rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name)); rb_raise(rb_eArgError, "hostname too long (%"PRIuVALUE")",
(VALUE)strlen(name));
} }
else { else {
strcpy(hbuf, name); strcpy(hbuf, name);
@ -875,7 +876,8 @@ port_str(VALUE port, char *pbuf, size_t len)
SafeStringValue(port); SafeStringValue(port);
serv = RSTRING_PTR(port); serv = RSTRING_PTR(port);
if (strlen(serv) >= len) { if (strlen(serv) >= len) {
rb_raise(rb_eArgError, "service name too long (%d)", strlen(serv)); rb_raise(rb_eArgError, "service name too long (%"PRIuVALUE")",
(VALUE)strlen(serv));
} }
strcpy(pbuf, serv); strcpy(pbuf, serv);
return pbuf; return pbuf;
@ -2044,12 +2046,12 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) { if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
rb_raise(rb_eSocket, rb_raise(rb_eSocket,
"file descriptor was not passed (msg_controllen=%d, %d expected)", "file descriptor was not passed (msg_controllen=%d, %d expected)",
msg.msg_controllen, CMSG_SPACE(sizeof(int))); (int)msg.msg_controllen, (int)CMSG_SPACE(sizeof(int)));
} }
if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) { if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
rb_raise(rb_eSocket, rb_raise(rb_eSocket,
"file descriptor was not passed (cmsg_len=%d, %d expected)", "file descriptor was not passed (cmsg_len=%d, %d expected)",
cmsg.hdr.cmsg_len, CMSG_LEN(sizeof(int))); (int)cmsg.hdr.cmsg_len, (int)CMSG_LEN(sizeof(int)));
} }
if (cmsg.hdr.cmsg_level != SOL_SOCKET) { if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
rb_raise(rb_eSocket, rb_raise(rb_eSocket,
@ -2065,7 +2067,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
if (msg.msg_accrightslen != sizeof(fd)) { if (msg.msg_accrightslen != sizeof(fd)) {
rb_raise(rb_eSocket, rb_raise(rb_eSocket,
"file descriptor was not passed (accrightslen) : %d != %d", "file descriptor was not passed (accrightslen) : %d != %d",
msg.msg_accrightslen, sizeof(fd)); msg.msg_accrightslen, (int)sizeof(fd));
} }
#endif #endif
@ -3474,7 +3476,7 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
} }
if (sizeof(struct sockaddr_un) < RSTRING_LEN(addr)) { if (sizeof(struct sockaddr_un) < RSTRING_LEN(addr)) {
rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d", rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
RSTRING_LEN(addr), sizeof(struct sockaddr_un)); RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un));
} }
sun_path = unixpath(sockaddr, RSTRING_LEN(addr)); sun_path = unixpath(sockaddr, RSTRING_LEN(addr));
if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) && if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) &&