mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make pa_socket_server_new static

Browse source 
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@gmail.com>
This commit is contained in:
Alexander E. Patrakov 2014-12-31 12:28:03 +05:00 • committed by David Henningsson
parent 73dee7c9f7
commit b094c92a01
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulsecore/socket-server.c
View file

@ -85,7 +85,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
@ -147,7 +146,7 @@ finish:
pa_socket_server_unref(s);
}
pa_socket_server* pa_socket_server_new(pa_mainloop_api *m, int fd) {
static pa_socket_server* socket_server_new(pa_mainloop_api *m, int fd) {
pa_socket_server *s;
pa_assert(m);
@ -160,8 +159,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;
}
@ -229,7 +226,7 @@ pa_socket_server* pa_socket_server_new_unix(pa_mainloop_api *m, const char *file
}
}
pa_assert_se(s = pa_socket_server_new(m, fd));
pa_assert_se(s = socket_server_new(m, fd));
s->filename = pa_xstrdup(filename);
s->type = SOCKET_SERVER_UNIX;
@ -298,7 +295,7 @@ pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address
goto fail;
}
pa_assert_se(ss = pa_socket_server_new(m, fd));
pa_assert_se(ss = socket_server_new(m, fd));
ss->type = SOCKET_SERVER_IPV4;
ss->tcpwrap_service = pa_xstrdup(tcpwrap_service);
@ -366,7 +363,7 @@ pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t ad
goto fail;
}
pa_assert_se(ss = pa_socket_server_new(m, fd));
pa_assert_se(ss = socket_server_new(m, fd));
ss->type = SOCKET_SERVER_IPV6;
ss->tcpwrap_service = pa_xstrdup(tcpwrap_service);

1
src/pulsecore/socket-server.h
View file

@ -29,7 +29,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);