ruby-changes:5551
From: nobu <ko1@a...>
Date: Mon, 9 Jun 2008 18:51:28 +0900 (JST)
Subject: [ruby-changes:5551] Ruby:r17055 (trunk): * ext/socket/socket.c: constified.
nobu 2008-06-09 18:51:21 +0900 (Mon, 09 Jun 2008) New Revision: 17055 Modified files: trunk/ext/socket/socket.c Log: * ext/socket/socket.c: constified. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/socket/socket.c?r1=17055&r2=17054&diff_format=u Index: ext/socket/socket.c =================================================================== --- ext/socket/socket.c (revision 17054) +++ ext/socket/socket.c (revision 17055) @@ -766,9 +766,9 @@ return val; } -NORETURN(static void raise_socket_error(char *, int)); +NORETURN(static void raise_socket_error(const char *, int)); static void -raise_socket_error(char *reason, int error) +raise_socket_error(const char *reason, int error) { #ifdef EAI_SYSTEM if (error == EAI_SYSTEM) rb_sys_fail(reason); @@ -1239,7 +1239,7 @@ int type = arg->type; struct addrinfo *res; int fd, status = 0; - char *syscall; + const char *syscall; arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM, (type == INET_SERVER) ? AI_PASSIVE : 0); @@ -1870,7 +1870,7 @@ return init_unixsock(sock, path, 0); } -static char* +static const char* unixpath(struct sockaddr_un *sockaddr, socklen_t len) { if (sockaddr->sun_path < (char*)sockaddr + len) @@ -3462,7 +3462,7 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr) { struct sockaddr_un * sockaddr; - char *sun_path; + const char *sun_path; VALUE path; sockaddr = (struct sockaddr_un*)StringValuePtr(addr); @@ -3488,7 +3488,7 @@ static VALUE mConst; static void -sock_define_const(char *name, int value) +sock_define_const(const char *name, int value) { rb_define_const(rb_cSocket, name, INT2FIX(value)); rb_define_const(mConst, name, INT2FIX(value)); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/