akr	2009-03-01 20:58:13 +0900 (Sun, 01 Mar 2009)

  New Revision: 22696

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22696

  Log:
    * ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c
    trunk/ext/socket/basicsocket.c
    trunk/ext/socket/init.c
    trunk/ext/socket/rubysocket.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22695)
+++ ChangeLog	(revision 22696)
@@ -1,3 +1,7 @@
+Sun Mar  1 20:57:41 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily.
+
 Sun Mar  1 19:52:46 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/dl/win32/lib/Win32API.rb (initialize): passes res
Index: ext/socket/rubysocket.h
===================================================================
--- ext/socket/rubysocket.h	(revision 22695)
+++ ext/socket/rubysocket.h	(revision 22696)
@@ -203,7 +203,7 @@
 int rsock_cmsg_type_arg(int family, int level, VALUE type);
 int rsock_shutdown_how_arg(VALUE how);
 
-int rb_sock_getfamily(int sockfd);
+int rsock_getfamily(int sockfd);
 
 int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
 int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
Index: ext/socket/init.c
===================================================================
--- ext/socket/init.c	(revision 22695)
+++ ext/socket/init.c	(revision 22696)
@@ -526,7 +526,8 @@
     return rsock_init_sock(rb_obj_alloc(klass), fd2);
 }
 
-int rb_sock_getfamily(int sockfd)
+int
+rsock_getfamily(int sockfd)
 {
     struct sockaddr_storage ss;
     socklen_t sslen = sizeof(ss);
Index: ext/socket/basicsocket.c
===================================================================
--- ext/socket/basicsocket.c	(revision 22695)
+++ ext/socket/basicsocket.c	(revision 22696)
@@ -212,7 +212,7 @@
 
     rb_secure(2);
     GetOpenFile(sock, fptr);
-    family = rb_sock_getfamily(fptr->fd);
+    family = rsock_getfamily(fptr->fd);
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
 
@@ -295,7 +295,7 @@
     int family;
 
     GetOpenFile(sock, fptr);
-    family = rb_sock_getfamily(fptr->fd);
+    family = rsock_getfamily(fptr->fd);
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
     len = 256;
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 22695)
+++ ext/socket/ancdata.c	(revision 22696)
@@ -1142,7 +1142,7 @@
 
     rb_secure(4);
     GetOpenFile(sock, fptr);
-    family = rb_sock_getfamily(fptr->fd);
+    family = rsock_getfamily(fptr->fd);
 
     data = vflags = dest_sockaddr = Qnil;
     controls_ptr = NULL;
@@ -1649,7 +1649,7 @@
 			 );
 
 #if defined(HAVE_ST_MSG_CONTROL)
-    family = rb_sock_getfamily(fptr->fd);
+    family = rsock_getfamily(fptr->fd);
     if (mh.msg_controllen) {
 	char *msg_end = (char *)mh.msg_control + mh.msg_controllen;
         for (cmh = CMSG_FIRSTHDR(&mh); cmh != NULL; cmh = CMSG_NXTHDR(&mh, cmh)) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/