[pulseaudio-discuss] [PATCH] Make pa_socket_server_new static

[Alexander E. Patrakov]

While at it, also remove SOCKET_SERVER_GENERIC, because it is always
being overwritten with a specific socket type.

Signed-off-by: Alexander E. Patrakov <patrakov at gmail.com>
---
 src/pulsecore/socket-server.c | 5 +----
 src/pulsecore/socket-server.h | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c
index 2c6b4f9..aac240c 100644
--- a/src/pulsecore/socket-server.c
+++ b/src/pulsecore/socket-server.c
@@ -87,7 +87,6 @@ struct pa_socket_server {
     pa_io_event *io_event;
     pa_mainloop_api *mainloop;
     enum {
-        SOCKET_SERVER_GENERIC,
         SOCKET_SERVER_IPV4,
         SOCKET_SERVER_UNIX,
         SOCKET_SERVER_IPV6
@@ -149,7 +148,7 @@ finish:
     pa_socket_server_unref(s);
 }
 
-pa_socket_server* pa_socket_server_new(pa_mainloop_api *m, int fd) {
+static pa_socket_server* pa_socket_server_new(pa_mainloop_api *m, int fd) {
     pa_socket_server *s;
 
     pa_assert(m);
@@ -162,8 +161,6 @@ pa_socket_server* pa_socket_server_new(pa_mainloop_api *m, int fd) {
 
     pa_assert_se(s->io_event = m->io_new(m, fd, PA_IO_EVENT_INPUT, callback, s));
 
-    s->type = SOCKET_SERVER_GENERIC;
-
     return s;
 }
 
diff --git a/src/pulsecore/socket-server.h b/src/pulsecore/socket-server.h
index a72bd9e..14dc5a3 100644
--- a/src/pulsecore/socket-server.h
+++ b/src/pulsecore/socket-server.h
@@ -31,7 +31,6 @@
 
 typedef struct pa_socket_server pa_socket_server;
 
-pa_socket_server* pa_socket_server_new(pa_mainloop_api *m, int fd);
 pa_socket_server* pa_socket_server_new_unix(pa_mainloop_api *m, const char *filename);
 pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address, uint16_t port, bool fallback, const char *tcpwrap_service);
 pa_socket_server* pa_socket_server_new_ipv4_loopback(pa_mainloop_api *m, uint16_t port, bool fallback, const char *tcpwrap_service);
-- 
2.2.1