diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/socket.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 248748d028..3d90ff4f6a 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -334,7 +334,7 @@ bsock_getsockopt(sock, lev, optname) if (getsockopt(fileno(fptr->f), level, option, buf, &len) < 0) rb_sys_fail(fptr->path); - return rb_tainted_str_new(buf, len); + return rb_str_new(buf, len); #else rb_notimplement(); #endif @@ -351,7 +351,7 @@ bsock_getsockname(sock) GetOpenFile(sock, fptr); if (getsockname(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0) rb_sys_fail("getsockname(2)"); - return rb_tainted_str_new(buf, len); + return rb_str_new(buf, len); } static VALUE @@ -365,7 +365,7 @@ bsock_getpeername(sock) GetOpenFile(sock, fptr); if (getpeername(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0) rb_sys_fail("getpeername(2)"); - return rb_tainted_str_new(buf, len); + return rb_str_new(buf, len); } static VALUE @@ -480,7 +480,7 @@ s_recvfrom(sock, argc, argv, from) return rb_assoc_new(str, unixaddr((struct sockaddr_un *)buf)); #endif case RECV_SOCKET: - return rb_assoc_new(str, rb_tainted_str_new(buf, alen)); + return rb_assoc_new(str, rb_str_new(buf, alen)); default: rb_bug("s_recvfrom called with bad value"); } @@ -530,7 +530,7 @@ mkipaddr(addr) char buf[1024]; mkipaddr0(addr, buf, sizeof(buf)); - return rb_tainted_str_new2(buf); + return rb_str_new2(buf); } static void @@ -664,14 +664,14 @@ ipaddr(sockaddr) if (error) { rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error)); } - addr1 = rb_tainted_str_new2(hbuf); + addr1 = rb_str_new2(hbuf); } error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV); if (error) { rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error)); } - addr2 = rb_tainted_str_new2(hbuf); + addr2 = rb_str_new2(hbuf); if (do_not_reverse_lookup) { addr1 = addr2; } @@ -1016,11 +1016,11 @@ tcp_s_gethostbyname(obj, host) #endif } ary = rb_ary_new(); - rb_ary_push(ary, rb_tainted_str_new2(h->h_name)); + rb_ary_push(ary, rb_str_new2(h->h_name)); names = rb_ary_new(); rb_ary_push(ary, names); for (pch = h->h_aliases; *pch; pch++) { - rb_ary_push(names, rb_tainted_str_new2(*pch)); + rb_ary_push(names, rb_str_new2(*pch)); } rb_ary_push(ary, INT2NUM(h->h_addrtype)); #ifdef h_addr @@ -1398,7 +1398,7 @@ unix_path(sock) rb_sys_fail(0); fptr->path = strdup(addr.sun_path); } - return rb_tainted_str_new2(fptr->path); + return rb_str_new2(fptr->path); } static VALUE @@ -1436,7 +1436,7 @@ unixaddr(sockaddr) struct sockaddr_un *sockaddr; { return rb_assoc_new(rb_str_new2("AF_UNIX"), - rb_tainted_str_new2(sockaddr->sun_path)); + rb_str_new2(sockaddr->sun_path)); } static VALUE @@ -1691,7 +1691,7 @@ sock_gethostname(obj) rb_sys_fail("gethostname"); buf[sizeof buf - 1] = '\0'; - return rb_tainted_str_new2(buf); + return rb_str_new2(buf); } #else #ifdef HAVE_UNAME @@ -1706,7 +1706,7 @@ sock_gethostname(obj) rb_secure(3); uname(&un); - return rb_tainted_str_new2(un.nodename); + return rb_str_new2(un.nodename); } #else static VALUE @@ -1734,19 +1734,19 @@ mkhostent(h) #endif } ary = rb_ary_new(); - rb_ary_push(ary, rb_tainted_str_new2(h->h_name)); + rb_ary_push(ary, rb_str_new2(h->h_name)); names = rb_ary_new(); rb_ary_push(ary, names); for (pch = h->h_aliases; *pch; pch++) { - rb_ary_push(names, rb_tainted_str_new2(*pch)); + rb_ary_push(names, rb_str_new2(*pch)); } rb_ary_push(ary, INT2NUM(h->h_addrtype)); #ifdef h_addr for (pch = h->h_addr_list; *pch; pch++) { - rb_ary_push(ary, rb_tainted_str_new(*pch, h->h_length)); + rb_ary_push(ary, rb_str_new(*pch, h->h_length)); } #else - rb_ary_push(ary, rb_tainted_str_new(h->h_addr, h->h_length)); + rb_ary_push(ary, rb_str_new(h->h_addr, h->h_length)); #endif return ary; @@ -2072,7 +2072,7 @@ sock_s_getnameinfo(argc, argv) } freeaddrinfo(res); } - return rb_assoc_new(rb_tainted_str_new2(hbuf), rb_tainted_str_new2(pbuf)); + return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf)); error_exit_addr: if (res) freeaddrinfo(res); |