1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

socket.c: format flags

Browse Source 
* ext/socket/socket.c (rsock_syserr_fail_host_port): use format flags,
  '+' to inspect, ' ' to quote unprintables.
* ext/socket/socket.c (rsock_syserr_fail_path): ditto.
* ext/socket/socket.c (rsock_syserr_fail_raddrinfo): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-01-04 10:15:31 +00:00
parent a3f2fe4e4d
commit 5b0fb1aadd
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,4 +1,11 @@
Sat Jan 4 19:13:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jan 4 19:15:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/socket.c (rsock_syserr_fail_host_port): use format flags,
'+' to inspect, ' ' to quote unprintables.
* ext/socket/socket.c (rsock_syserr_fail_path): ditto.
* ext/socket/socket.c (rsock_syserr_fail_raddrinfo): ditto.
* ext/socket/socket.c (rsock_syserr_fail_host_port): add errno * ext/socket/socket.c (rsock_syserr_fail_host_port): add errno
argument version anduse rb_syserr_fail_str() instead of argument version anduse rb_syserr_fail_str() instead of

18
ext/socket/socket.c
View File

@ -23,10 +23,8 @@ rsock_syserr_fail_host_port(int err, const char *mesg, VALUE host, VALUE port)
{ {
VALUE message; VALUE message;
port = rb_String(port); message = rb_sprintf("%s for %+"PRIsVALUE" port % "PRIsVALUE"",
mesg, host, port);
message = rb_sprintf("%s for \"%s\" port %s",
mesg, StringValueCStr(host), StringValueCStr(port));
rb_syserr_fail_str(err, message); rb_syserr_fail_str(err, message);
} }
@ -43,15 +41,7 @@ rsock_syserr_fail_path(int err, const char *mesg, VALUE path)
VALUE message; VALUE message;
if (RB_TYPE_P(path, T_STRING)) { if (RB_TYPE_P(path, T_STRING)) {
if (memchr(RSTRING_PTR(path), '\0', RSTRING_LEN(path))) { message = rb_sprintf("%s for % "PRIsVALUE"", mesg, path);
path = rb_str_inspect(path);
message = rb_sprintf("%s for %s", mesg,
StringValueCStr(path));
}
else {
message = rb_sprintf("%s for \"%s\"", mesg,
StringValueCStr(path));
}
rb_syserr_fail_str(err, message); rb_syserr_fail_str(err, message);
} }
else { else {
@ -87,7 +77,7 @@ rsock_syserr_fail_raddrinfo(int err, const char *mesg, VALUE rai)
VALUE str, message; VALUE str, message;
str = rsock_addrinfo_inspect_sockaddr(rai); str = rsock_addrinfo_inspect_sockaddr(rai);
message = rb_sprintf("%s for %s", mesg, StringValueCStr(str)); message = rb_sprintf("%s for %"PRIsVALUE"", mesg, str);
rb_syserr_fail_str(err, message); rb_syserr_fail_str(err, message);
} }