From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Tue, 6 Nov 2012 12:38:57 +0000 (+0100)
Subject: Rename some functions for consistency
X-Git-Tag: php-5.5.0alpha5~43^2~11^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b18bd8904e41941db204ac6b2bf4cf43421e8838;p=php

Rename some functions for consistency
---

diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 88b937f828..201adbda43 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -1723,7 +1723,7 @@ PHP_FUNCTION(socket_cmsg_space)
 	RETURN_LONG((long)CMSG_SPACE(entry->size + n * entry->var_el_size));
 }
 
-void _socket_sendrecvmsg_init(INIT_FUNC_ARGS)
+void php_socket_sendrecvmsg_init(INIT_FUNC_ARGS)
 {
 	/* IPv6 ancillary data
 	 * Note that support for sticky options via setsockopt() is not implemented
@@ -1763,7 +1763,7 @@ void _socket_sendrecvmsg_init(INIT_FUNC_ARGS)
 #endif
 }
 
-void _socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS)
+void php_socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS)
 {
 #ifdef ZTS
 	tsrm_mutex_free(ancillary_mutex);
diff --git a/ext/sockets/sendrecvmsg.h b/ext/sockets/sendrecvmsg.h
index 82dc456e65..929a6ad9cf 100644
--- a/ext/sockets/sendrecvmsg.h
+++ b/ext/sockets/sendrecvmsg.h
@@ -4,5 +4,5 @@ PHP_FUNCTION(socket_sendmsg);
 PHP_FUNCTION(socket_recvmsg);
 PHP_FUNCTION(socket_cmsg_space);
 
-void _socket_sendrecvmsg_init(INIT_FUNC_ARGS);
-void _socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS);
+void php_socket_sendrecvmsg_init(INIT_FUNC_ARGS);
+void php_socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS);
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 9f11594425..1d86028691 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -751,7 +751,7 @@ PHP_MINIT_FUNCTION(sockets)
 	REGISTER_LONG_CONSTANT("IPV6_UNICAST_HOPS",			IPV6_UNICAST_HOPS,	CONST_CS | CONST_PERSISTENT);
 #endif
 
-	_socket_sendrecvmsg_init(INIT_FUNC_ARGS_PASSTHRU);
+	php_socket_sendrecvmsg_init(INIT_FUNC_ARGS_PASSTHRU);
 
 	return SUCCESS;
 }
@@ -774,7 +774,7 @@ PHP_RSHUTDOWN_FUNCTION(sockets)
 		efree(SOCKETS_G(strerror_buf));
 		SOCKETS_G(strerror_buf) = NULL;
 	}
-	_socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+	php_socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 
 	return SUCCESS;
 }