remap: Change remapping function argument type from void to int16_t / float as approp...

[pulseaudio] / src / pulsecore / socket-client.c

diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c
index 31acfd2dd0d6f968f02894c3d4961c8c7013fd19..564a36688fbcd5d17cc3d9b73b1ce6bb28dae072 100644 (file)
--- a/src/pulsecore/socket-client.c
+++ b/src/pulsecore/socket-client.c
@@ -35,9 +35,6 @@
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -63,6 +60,7 @@
 #include <pulsecore/parseaddr.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/refcnt.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "socket-client.h"
 
@@ -80,7 +78,7 @@ struct pa_socket_client {
     pa_socket_client_cb_t callback;
     void *userdata;
 
-    pa_bool_t local;
+    bool local;
 
 #ifdef HAVE_LIBASYNCNS
     asyncns_t *asyncns;
@@ -228,7 +226,6 @@ pa_socket_client* pa_socket_client_new_ipv4(pa_mainloop_api *m, uint32_t address
     return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa));
 }
 
-
 pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char *filename) {
 #ifdef HAVE_SYS_UN_H
     struct sockaddr_un sa;
@@ -421,7 +418,7 @@ static void timeout_cb(pa_mainloop_api *m, pa_time_event *e, const struct timeva
     do_call(c);
 }
 
-static void start_timeout(pa_socket_client *c, pa_bool_t use_rtclock) {
+static void start_timeout(pa_socket_client *c, bool use_rtclock) {
     struct timeval tv;
 
     pa_assert(c);
@@ -430,7 +427,7 @@ static void start_timeout(pa_socket_client *c, pa_bool_t use_rtclock) {
     c->timeout_event = c->mainloop->time_new(c->mainloop, pa_timeval_rtstore(&tv, pa_rtclock_now() + CONNECT_TIMEOUT * PA_USEC_PER_SEC, use_rtclock), timeout_cb, c);
 }
 
-pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_rtclock, const char*name, uint16_t default_port) {
+pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, bool use_rtclock, const char*name, uint16_t default_port) {
     pa_socket_client *c = NULL;
     pa_parsed_address a;
 
@@ -522,7 +519,7 @@ pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_
                 if (!host)
                     goto finish;
 
-                pa_zero(sa);
+                pa_zero(s);
                 s.sin_family = AF_INET;
                 memcpy(&s.sin_addr, host->h_addr, sizeof(struct in_addr));
                 s.sin_port = htons(a.port);
@@ -543,7 +540,7 @@ finish:
 /* Return non-zero when the target sockaddr is considered
    local. "local" means UNIX socket or TCP socket on localhost. Other
    local IP addresses are not considered local. */
-pa_bool_t pa_socket_client_is_local(pa_socket_client *c) {
+bool pa_socket_client_is_local(pa_socket_client *c) {
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);