diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-05 15:58:46 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-05 15:58:46 +0000 |
| commit | 20a2c6803af6e921bb7c138cd53d030f47a26279 (patch) | |
| tree | 9427d0b4efb57baddbcb07ce8f8d83f7a0bd8645 /ext/socket | |
| parent | f2f8e5a8433061995f91ddace3c5f51f458f3a58 (diff) | |
| download | ruby-20a2c6803af6e921bb7c138cd53d030f47a26279.tar.gz ruby-20a2c6803af6e921bb7c138cd53d030f47a26279.tar.xz ruby-20a2c6803af6e921bb7c138cd53d030f47a26279.zip | |
* 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.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/socket.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b4b6412f3..1e113ef1b 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -850,7 +850,8 @@ host_str(VALUE host, char *hbuf, size_t len) make_inetaddr(INADDR_BROADCAST, hbuf, 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 { strcpy(hbuf, name); @@ -875,7 +876,8 @@ port_str(VALUE port, char *pbuf, size_t len) SafeStringValue(port); serv = RSTRING_PTR(port); 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); return pbuf; @@ -2044,12 +2046,12 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock) if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) { rb_raise(rb_eSocket, "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))) { rb_raise(rb_eSocket, "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) { rb_raise(rb_eSocket, @@ -2065,7 +2067,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock) if (msg.msg_accrightslen != sizeof(fd)) { rb_raise(rb_eSocket, "file descriptor was not passed (accrightslen) : %d != %d", - msg.msg_accrightslen, sizeof(fd)); + msg.msg_accrightslen, (int)sizeof(fd)); } #endif @@ -3474,7 +3476,7 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr) } if (sizeof(struct sockaddr_un) < RSTRING_LEN(addr)) { 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)); if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) && |