[farsight2/master] Fix some little coding style problems found by sparse
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:21:50 PST 2008
---
gst-libs/gst/farsight/fs-plugin.c | 4 ++--
gst-libs/gst/farsight/fs-session.c | 2 +-
gst/fsrtpconference/fs-rtp-codec-cache.c | 6 +++---
gst/fsrtpconference/fs-rtp-session.c | 2 +-
gst/fsrtpconference/fs-rtp-specific-nego.c | 2 +-
transmitters/rawudp/fs-interfaces.c | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/gst-libs/gst/farsight/fs-plugin.c b/gst-libs/gst/farsight/fs-plugin.c
index 7886445..c99b7cd 100644
--- a/gst-libs/gst/farsight/fs-plugin.c
+++ b/gst-libs/gst/farsight/fs-plugin.c
@@ -55,7 +55,7 @@ static void fs_plugin_unload (GTypeModule *module);
static gchar **search_paths = NULL;
-GList *plugins = NULL;
+static GList *plugins = NULL;
static GObjectClass *parent_class = NULL;
@@ -71,7 +71,7 @@ static void fs_plugin_dispose (GObject * object);
static void fs_plugin_finalize (GObject * object);
static void
-fs_plugin_search_path_init ()
+fs_plugin_search_path_init (void)
{
const gchar *env;
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index 01ed1c7..1f6d21d 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -323,7 +323,7 @@ fs_session_set_property (GObject *object,
{
}
-void
+static void
fs_session_error_forward (GObject *signal_src,
gint error_no, gchar *error_msg,
gchar *debug_msg, FsSession *session)
diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.c b/gst/fsrtpconference/fs-rtp-codec-cache.c
index 1284130..ca7f3d2 100644
--- a/gst/fsrtpconference/fs-rtp-codec-cache.c
+++ b/gst/fsrtpconference/fs-rtp-codec-cache.c
@@ -264,18 +264,18 @@ load_codecs_cache (FsMediaType media_type, GError **error)
} else {
g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS,
"Invalid media type %d", media_type);
- return FALSE;
+ return NULL;
}
cache_path = get_codecs_cache_path (media_type, error);
if (!cache_path)
- return FALSE;
+ return NULL;
if (!codecs_cache_valid (cache_path)) {
GST_DEBUG ("Codecs cache %s is outdated or does not exist", cache_path);
g_free (cache_path);
- return FALSE;
+ return NULL;
}
GST_DEBUG ("Loading codecs cache %s", cache_path);
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 3a355d6..5af0070 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -1588,7 +1588,7 @@ fs_rtp_session_negotiate_codecs (FsRtpSession *session,
GError **error)
{
gboolean has_many_streams = FALSE;
- GHashTable *new_negotiated_codec_associations = NULL;;
+ GHashTable *new_negotiated_codec_associations = NULL;
GList *new_negotiated_codecs = NULL;
GList *item;
diff --git a/gst/fsrtpconference/fs-rtp-specific-nego.c b/gst/fsrtpconference/fs-rtp-specific-nego.c
index 5b132a5..850dd2e 100644
--- a/gst/fsrtpconference/fs-rtp-specific-nego.c
+++ b/gst/fsrtpconference/fs-rtp-specific-nego.c
@@ -48,7 +48,7 @@ static FsCodec *
sdp_is_compat_h263_1998 (GstCaps *rtp_caps, FsCodec *local_codec,
FsCodec *remote_codec);
-struct SdpCompatCheck sdp_compat_checks[] = {
+static struct SdpCompatCheck sdp_compat_checks[] = {
{FS_MEDIA_TYPE_AUDIO, "iLBC", sdp_is_compat_ilbc},
{FS_MEDIA_TYPE_VIDEO, "H263-1998", sdp_is_compat_h263_1998},
{0, NULL, NULL}
diff --git a/transmitters/rawudp/fs-interfaces.c b/transmitters/rawudp/fs-interfaces.c
index 8dc9de8..46982a6 100644
--- a/transmitters/rawudp/fs-interfaces.c
+++ b/transmitters/rawudp/fs-interfaces.c
@@ -411,6 +411,6 @@ gchar * farsight_get_ip_for_interface (gchar *interface_name)
#else /* G_OS_WIN32 */
-#error Can\'t use this method for retreiving ip list from OS other than unix or windows
+#error Can not use this method for retreiving ip list from OS other than unix or windows
#endif /* G_OS_WIN32 */
#endif /* G_OS_UNIX */
--
1.5.6.5
More information about the farsight-commits
mailing list