ruby-changes:15140
From: akr <ko1@a...>
Date: Tue, 23 Mar 2010 01:16:23 +0900 (JST)
Subject: [ruby-changes:15140] Ruby:r27018 (trunk): * ext/socket: use rsock_ prefix for internal initialization functions.
akr 2010-03-23 01:15:21 +0900 (Tue, 23 Mar 2010) New Revision: 27018 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27018 Log: * ext/socket: use rsock_ prefix for internal initialization functions. Modified files: trunk/ChangeLog trunk/ext/socket/ancdata.c trunk/ext/socket/basicsocket.c trunk/ext/socket/constants.c trunk/ext/socket/init.c trunk/ext/socket/ipsocket.c trunk/ext/socket/option.c trunk/ext/socket/raddrinfo.c trunk/ext/socket/rubysocket.h trunk/ext/socket/socket.c trunk/ext/socket/sockssocket.c trunk/ext/socket/tcpserver.c trunk/ext/socket/tcpsocket.c trunk/ext/socket/udpsocket.c trunk/ext/socket/unixserver.c trunk/ext/socket/unixsocket.c Index: ChangeLog =================================================================== --- ChangeLog (revision 27017) +++ ChangeLog (revision 27018) @@ -1,3 +1,7 @@ +Tue Mar 23 01:13:59 2010 Tanaka Akira <akr@f...> + + * ext/socket: use rsock_ prefix for internal initialization functions. + Mon Mar 22 20:32:22 2010 wanabe <s.wanabe@g...> * proc.c (rb_method_location): return attr's location if it is setup. Index: ext/socket/tcpsocket.c =================================================================== --- ext/socket/tcpsocket.c (revision 27017) +++ ext/socket/tcpsocket.c (revision 27018) @@ -61,7 +61,7 @@ * TCPSocket represents a TCP/IP client socket. */ void -Init_tcpsocket(void) +rsock_init_tcpsocket(void) { rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket); rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1); Index: ext/socket/rubysocket.h =================================================================== --- ext/socket/rubysocket.h (revision 27017) +++ ext/socket/rubysocket.h (revision 27018) @@ -273,18 +273,18 @@ void rsock_discard_cmsg_resource(struct msghdr *mh); #endif -void Init_basicsocket(void); -void Init_ipsocket(void); -void Init_tcpsocket(void); -void Init_tcpserver(void); -void Init_sockssocket(void); -void Init_udpsocket(void); -void Init_unixsocket(void); -void Init_unixserver(void); -void Init_socket_constants(void); -void Init_ancdata(void); -void Init_addrinfo(void); -void Init_sockopt(void); -void Init_socket_init(void); +void rsock_init_basicsocket(void); +void rsock_init_ipsocket(void); +void rsock_init_tcpsocket(void); +void rsock_init_tcpserver(void); +void rsock_init_sockssocket(void); +void rsock_init_udpsocket(void); +void rsock_init_unixsocket(void); +void rsock_init_unixserver(void); +void rsock_init_socket_constants(void); +void rsock_init_ancdata(void); +void rsock_init_addrinfo(void); +void rsock_init_sockopt(void); +void rsock_init_socket_init(void); #endif Index: ext/socket/udpsocket.c =================================================================== --- ext/socket/udpsocket.c (revision 27017) +++ ext/socket/udpsocket.c (revision 27018) @@ -252,7 +252,7 @@ * UDPSocket represents a UDP/IP socket. */ void -Init_udpsocket(void) +rsock_init_udpsocket(void) { rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket); rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1); Index: ext/socket/init.c =================================================================== --- ext/socket/init.c (revision 27017) +++ ext/socket/init.c (revision 27018) @@ -552,18 +552,18 @@ * SocketError is the error class for socket. */ void -Init_socket_init() +rsock_init_socket_init() { rb_eSocket = rb_define_class("SocketError", rb_eStandardError); - Init_ipsocket(); - Init_tcpsocket(); - Init_tcpserver(); - Init_sockssocket(); - Init_udpsocket(); - Init_unixsocket(); - Init_unixserver(); - Init_sockopt(); - Init_ancdata(); - Init_addrinfo(); - Init_socket_constants(); + rsock_init_ipsocket(); + rsock_init_tcpsocket(); + rsock_init_tcpserver(); + rsock_init_sockssocket(); + rsock_init_udpsocket(); + rsock_init_unixsocket(); + rsock_init_unixserver(); + rsock_init_sockopt(); + rsock_init_ancdata(); + rsock_init_addrinfo(); + rsock_init_socket_constants(); } Index: ext/socket/option.c =================================================================== --- ext/socket/option.c (revision 27017) +++ ext/socket/option.c (revision 27018) @@ -666,7 +666,7 @@ * It contains socket family, protocol level, option name and option value. */ void -Init_sockopt(void) +rsock_init_sockopt(void) { rb_cSockOpt = rb_define_class_under(rb_cSocket, "Option", rb_cObject); rb_define_method(rb_cSockOpt, "initialize", sockopt_initialize, 4); Index: ext/socket/raddrinfo.c =================================================================== --- ext/socket/raddrinfo.c (revision 27017) +++ ext/socket/raddrinfo.c (revision 27018) @@ -2116,7 +2116,7 @@ * Addrinfo class */ void -Init_addrinfo(void) +rsock_init_addrinfo(void) { rb_cAddrinfo = rb_define_class("Addrinfo", rb_cData); rb_define_alloc_func(rb_cAddrinfo, addrinfo_s_allocate); Index: ext/socket/unixserver.c =================================================================== --- ext/socket/unixserver.c (revision 27017) +++ ext/socket/unixserver.c (revision 27018) @@ -141,7 +141,7 @@ * UNIXServer represents a UNIX domain stream server socket. */ void -Init_unixserver(void) +rsock_init_unixserver(void) { #ifdef HAVE_SYS_UN_H rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket); Index: ext/socket/constants.c =================================================================== --- ext/socket/constants.c (revision 27017) +++ ext/socket/constants.c (revision 27018) @@ -138,7 +138,7 @@ * Socket::Constants module */ void -Init_socket_constants(void) +rsock_init_socket_constants(void) { /* constants */ init_constants(); Index: ext/socket/tcpserver.c =================================================================== --- ext/socket/tcpserver.c (revision 27017) +++ ext/socket/tcpserver.c (revision 27018) @@ -134,7 +134,7 @@ * TCPServer represents a TCP/IP server socket. */ void -Init_tcpserver(void) +rsock_init_tcpserver(void) { rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket); rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0); Index: ext/socket/ipsocket.c =================================================================== --- ext/socket/ipsocket.c (revision 27017) +++ ext/socket/ipsocket.c (revision 27018) @@ -289,7 +289,7 @@ * IPSocket is the super class of TCPSocket and UDPSocket. */ void -Init_ipsocket(void) +rsock_init_ipsocket(void) { rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket); rb_define_method(rb_cIPSocket, "addr", ip_addr, -1); Index: ext/socket/socket.c =================================================================== --- ext/socket/socket.c (revision 27017) +++ ext/socket/socket.c (revision 27018) @@ -1830,11 +1830,11 @@ void Init_socket() { - Init_basicsocket(); + rsock_init_basicsocket(); rb_cSocket = rb_define_class("Socket", rb_cBasicSocket); - Init_socket_init(); + rsock_init_socket_init(); rb_define_method(rb_cSocket, "initialize", sock_initialize, -1); rb_define_method(rb_cSocket, "connect", sock_connect, 1); Index: ext/socket/basicsocket.c =================================================================== --- ext/socket/basicsocket.c (revision 27017) +++ ext/socket/basicsocket.c (revision 27018) @@ -736,7 +736,7 @@ * BasicSocket is the super class for the all socket classes. */ void -Init_basicsocket(void) +rsock_init_basicsocket(void) { rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO); rb_undef_method(rb_cBasicSocket, "initialize"); Index: ext/socket/ancdata.c =================================================================== --- ext/socket/ancdata.c (revision 27017) +++ ext/socket/ancdata.c (revision 27018) @@ -1775,7 +1775,7 @@ * It contains socket family, cmsg level, cmsg type and cmsg data. */ void -Init_ancdata(void) +rsock_init_ancdata(void) { #if defined(HAVE_ST_MSG_CONTROL) rb_cAncillaryData = rb_define_class_under(rb_cSocket, "AncillaryData", rb_cObject); Index: ext/socket/sockssocket.c =================================================================== --- ext/socket/sockssocket.c (revision 27017) +++ ext/socket/sockssocket.c (revision 27018) @@ -46,7 +46,7 @@ * SOCKSSocket class */ void -Init_sockssocket(void) +rsock_init_sockssocket(void) { #ifdef SOCKS rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket); Index: ext/socket/unixsocket.c =================================================================== --- ext/socket/unixsocket.c (revision 27017) +++ ext/socket/unixsocket.c (revision 27018) @@ -490,7 +490,7 @@ * UNIXSocket represents a UNIX domain stream client socket. */ void -Init_unixsocket(void) +rsock_init_unixsocket(void) { #ifdef HAVE_SYS_UN_H rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/