Rename some functions for consistency

diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 88b937f8285ecfbe59b13783dab06895044857e3..201adbda4336233b28ad1993458e67a249488052 100644 (file)
--- 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 82dc456e65538cd47ac07a0ab822a5cd93b855e0..929a6ad9cfe17ea9ba58dbff1025965781ea2333 100644 (file)
--- 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 9f1159442594422aa4a8e87ade58d2c4dd7f281c..1d86028691b532a9c6ba723aa5be9dcfa29a7bcd 100644 (file)
--- 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;
 }