nobu	2011-11-29 09:51:40 +0900 (Tue, 29 Nov 2011)

  New Revision: 33893

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

  Log:
    * win32/win32.c (rb_w32_inet_ntop): constified.

  Modified files:
    trunk/include/ruby/win32.h
    trunk/win32/win32.c

Index: include/ruby/win32.h
===================================================================
--- include/ruby/win32.h	(revision 33892)
+++ include/ruby/win32.h	(revision 33893)
@@ -273,7 +273,7 @@
 extern char **rb_w32_get_environ(void);
 extern void   rb_w32_free_environ(char **);
 extern int    rb_w32_map_errno(DWORD);
-extern char * WSAAPI rb_w32_inet_ntop(int,void *,char *,size_t);
+extern char * WSAAPI rb_w32_inet_ntop(int,const void *,char *,size_t);
 extern DWORD  rb_w32_osver(void);
 
 extern int chown(const char *, int, int);
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 33892)
+++ win32/win32.c	(revision 33893)
@@ -6130,17 +6130,18 @@
 
 /* License: Ruby's */
 char * WSAAPI
-rb_w32_inet_ntop(int af, void *addr, char *numaddr, size_t numaddr_len)
+rb_w32_inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 {
     typedef char *(WSAAPI inet_ntop_t)(int, void *, char *, size_t);
     inet_ntop_t *pInetNtop;
     pInetNtop = (inet_ntop_t *)get_proc_address("ws2_32", "inet_ntop", NULL);
-    if(pInetNtop){
-       return pInetNtop(af,addr,numaddr,numaddr_len);
-    }else{
-       struct in_addr in;
-       memcpy(&in.s_addr, addr, sizeof(in.s_addr));
-       snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in));
+    if (pInetNtop) {
+	return pInetNtop(af, (void *)addr, numaddr, numaddr_len);
     }
+    else {
+	struct in_addr in;
+	memcpy(&in.s_addr, addr, sizeof(in.s_addr));
+	snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in));
+    }
     return numaddr;
 }

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