From 957a4a65c649293717634602725e21ffc2fe84ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 9 Feb 2014 10:45:28 +0100 Subject: [PATCH] rtsp-server: Fix lots of compiler warnings with clang --- gst/rtsp-server/rtsp-client.c | 5 +++-- gst/rtsp-server/rtsp-mount-points.c | 5 +++-- gst/rtsp-server/rtsp-stream.c | 4 ++-- tests/check/gst/client.c | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 8744e2c..1a3fa45 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -1040,10 +1040,11 @@ invalid_state: /* convert @url and @path to a URL used as a content base for the factory * located at @path */ static gchar * -make_base_url (GstRTSPClient * client, GstRTSPUrl * url, gchar * path) +make_base_url (GstRTSPClient * client, GstRTSPUrl * url, const gchar * path) { GstRTSPUrl tmp; - gchar *result, *trail; + gchar *result; + const gchar *trail; /* check for trailing '/' and append one */ trail = (path[strlen (path) - 1] != '/' ? "/" : ""); diff --git a/gst/rtsp-server/rtsp-mount-points.c b/gst/rtsp-server/rtsp-mount-points.c index dbf5473..2bddb64 100644 --- a/gst/rtsp-server/rtsp-mount-points.c +++ b/gst/rtsp-server/rtsp-mount-points.c @@ -72,7 +72,7 @@ data_item_free (gpointer data) } static void -data_item_dump (gconstpointer a, gpointer prefix) +data_item_dump (gconstpointer a, gconstpointer prefix) { const DataItem *item = a; @@ -251,7 +251,8 @@ gst_rtsp_mount_points_match (GstRTSPMountPoints * mounts, g_mutex_lock (&priv->lock); if (priv->dirty) { g_sequence_sort (priv->mounts, data_item_compare, mounts); - g_sequence_foreach (priv->mounts, (GFunc) data_item_dump, "sort :"); + g_sequence_foreach (priv->mounts, (GFunc) data_item_dump, + (gpointer) "sort :"); priv->dirty = FALSE; } diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c index 4bea0fd..8b255eb 100644 --- a/gst/rtsp-server/rtsp-stream.c +++ b/gst/rtsp-server/rtsp-stream.c @@ -2194,7 +2194,7 @@ gst_rtsp_stream_get_rtp_socket (GstRTSPStream * stream, GSocketFamily family) { GstRTSPStreamPrivate *priv = GST_RTSP_STREAM_GET_PRIVATE (stream); GSocket *socket; - gchar *name; + const gchar *name; g_return_val_if_fail (GST_IS_RTSP_STREAM (stream), NULL); g_return_val_if_fail (family == G_SOCKET_FAMILY_IPV4 || @@ -2228,7 +2228,7 @@ gst_rtsp_stream_get_rtcp_socket (GstRTSPStream * stream, GSocketFamily family) { GstRTSPStreamPrivate *priv = GST_RTSP_STREAM_GET_PRIVATE (stream); GSocket *socket; - gchar *name; + const gchar *name; g_return_val_if_fail (GST_IS_RTSP_STREAM (stream), NULL); g_return_val_if_fail (family == G_SOCKET_FAMILY_IPV4 || diff --git a/tests/check/gst/client.c b/tests/check/gst/client.c index da99aa8..896a6cc 100644 --- a/tests/check/gst/client.c +++ b/tests/check/gst/client.c @@ -144,7 +144,7 @@ setup_client (const gchar * launch_line) } static void -teardown_client (GstRTSPClient *client) +teardown_client (GstRTSPClient * client) { gst_rtsp_client_set_thread_pool (client, NULL); g_object_unref (client); @@ -332,7 +332,7 @@ GST_START_TEST (test_describe) GST_END_TEST; -gchar *expected_transport = NULL;; +static const gchar *expected_transport = NULL;; static gboolean test_setup_response_200_multicast (GstRTSPClient * client, -- 2.7.4