diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-19 21:04:19 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-20 08:48:48 +0200 |
| commit | 76a959a578c1039235988d886bcf335fff0c85f1 (patch) | |
| tree | 9c0026cff0f157fdf784945ef5b30ada536944ed /src | |
| parent | f43873dc5fc845d4a195ea8b2328fcc9ae3565b1 (diff) | |
| download | mpd-76a959a578c1039235988d886bcf335fff0c85f1.tar.gz mpd-76a959a578c1039235988d886bcf335fff0c85f1.tar.xz mpd-76a959a578c1039235988d886bcf335fff0c85f1.zip | |
rtsp_client, output/raop: use close_socket() instead of close()
Diffstat (limited to 'src')
| -rw-r--r-- | src/output/raop_output_plugin.c | 8 | ||||
| -rw-r--r-- | src/rtsp_client.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/output/raop_output_plugin.c b/src/output/raop_output_plugin.c index dce7b5beb..4bb20c70d 100644 --- a/src/output/raop_output_plugin.c +++ b/src/output/raop_output_plugin.c @@ -21,7 +21,7 @@ #include "raop_output_plugin.h" #include "output_api.h" #include "mixer_list.h" -#include "raop_output_plugin.h" +#include "fd_util.h" #include "ntp_server.h" #include "rtsp_client.h" #include "glib_compat.h" @@ -162,10 +162,10 @@ raop_session_free(struct raop_session_data *session) g_mutex_free(session->list_mutex); if (raop_session->data_fd >= 0) - close(raop_session->data_fd); + close_socket(raop_session->data_fd); if (raop_session->ctrl.fd >= 0) - close(raop_session->ctrl.fd); + close_socket(raop_session->ctrl.fd); g_free(session); } @@ -345,7 +345,7 @@ open_udp_socket(char *hostname, unsigned short *port, return -1; } if (bind_host(sd, hostname, 0, port, error_r)) { - close(sd); + close_socket(sd); return -1; } diff --git a/src/rtsp_client.c b/src/rtsp_client.c index a808ef207..864b3a7f4 100644 --- a/src/rtsp_client.c +++ b/src/rtsp_client.c @@ -21,8 +21,10 @@ * Based on the RTSP client by Shiro Ninomiya <shiron@snino.com> */ +#include "config.h" #include "rtsp_client.h" #include "tcp_socket.h" +#include "fd_util.h" #include "glib_compat.h" #include <assert.h> @@ -164,7 +166,7 @@ open_tcp_socket(char *hostname, unsigned short *port, return -1; } if (bind_host(sd, hostname, 0, port, error_r)) { - close(sd); + close_socket(sd); return -1; } |