From aa2b22bba288a06b8faea3180613e896a8b3f084 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 Mar 2009 11:58:13 +0000
Subject: [PATCH] * ext/socket/ (rsock_getfamily): renamed from
 rb_sock_getfamily.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 4 ++++
 ext/socket/ancdata.c     | 4 ++--
 ext/socket/basicsocket.c | 4 ++--
 ext/socket/init.c        | 3 ++-
 ext/socket/rubysocket.h  | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61c57e5a9b..38d8c981c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar  1 20:57:41 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily.
+
 Sun Mar  1 19:52:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/dl/win32/lib/Win32API.rb (initialize): passes res
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 94e8296d94..edc93630ca 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1142,7 +1142,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
 
     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 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
 			 );
 
 #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)) {
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
index 6f3426abb1..a8ab3906e1 100644
--- a/ext/socket/basicsocket.c
+++ b/ext/socket/basicsocket.c
@@ -212,7 +212,7 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
 
     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 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
     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;
diff --git a/ext/socket/init.c b/ext/socket/init.c
index c1caf2f87e..5046be8393 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -526,7 +526,8 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
     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);
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 6a71c45b35..27980c3874 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -203,7 +203,7 @@ int rsock_optname_arg(int family, int level, VALUE optname);
 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);