[farsight2/master] Fix various small coding style issues ( func()->func () mostly)
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:21:50 PST 2008
---
gst/fsrtpconference/fs-rtp-codec-cache.c | 82 ++++++++++----------
gst/fsrtpconference/fs-rtp-codec-cache.h | 4 +-
gst/fsrtpconference/fs-rtp-conference.c | 6 +-
gst/fsrtpconference/fs-rtp-conference.h | 4 +-
gst/fsrtpconference/fs-rtp-discover-codecs.c | 36 ++++----
gst/fsrtpconference/fs-rtp-dtmf-event-source.c | 2 +-
gst/fsrtpconference/fs-rtp-dtmf-event-source.h | 2 +-
gst/fsrtpconference/fs-rtp-dtmf-sound-source.h | 2 +-
gst/fsrtpconference/fs-rtp-session.c | 40 +++++-----
gst/fsrtpconference/fs-rtp-session.h | 2 +-
gst/fsrtpconference/fs-rtp-special-source.h | 2 +-
gst/fsrtpconference/fs-rtp-stream.h | 2 +-
gst/fsrtpconference/fs-rtp-substream.h | 2 +-
gst/funnel/gstfsfunnel.h | 2 +-
tests/check/main/rtpconference.c | 2 +-
tests/check/transmitter/multicast.c | 2 +-
tests/check/transmitter/rawudp.c | 8 +-
.../multicast/fs-multicast-stream-transmitter.h | 2 +-
transmitters/multicast/fs-multicast-transmitter.c | 9 +-
transmitters/multicast/fs-multicast-transmitter.h | 2 +-
transmitters/rawudp/fs-interfaces.c | 56 +++++++-------
transmitters/rawudp/fs-rawudp-stream-transmitter.c | 6 +-
transmitters/rawudp/fs-rawudp-stream-transmitter.h | 2 +-
transmitters/rawudp/fs-rawudp-transmitter.c | 2 +-
transmitters/rawudp/fs-rawudp-transmitter.h | 2 +-
25 files changed, 141 insertions(+), 140 deletions(-)
diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.c b/gst/fsrtpconference/fs-rtp-codec-cache.c
index a5f14df..1284130 100644
--- a/gst/fsrtpconference/fs-rtp-codec-cache.c
+++ b/gst/fsrtpconference/fs-rtp-codec-cache.c
@@ -39,7 +39,7 @@
#define GST_CAT_DEFAULT fsrtpconference_disco
-static gboolean codecs_cache_valid(gchar *cache_path) {
+static gboolean codecs_cache_valid (gchar *cache_path) {
time_t cache_ts = 0;
time_t registry_ts = 0;
struct stat cache_stat;
@@ -54,25 +54,25 @@ static gboolean codecs_cache_valid(gchar *cache_path) {
registry_xml_path = g_build_filename (g_get_home_dir (),
".gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".xml", NULL);
} else {
- registry_bin_path = g_strdup(registry_xml_path);
+ registry_bin_path = g_strdup (registry_xml_path);
}
- if (stat(registry_xml_path, ®istry_stat) == 0) {
+ if (stat (registry_xml_path, ®istry_stat) == 0) {
registry_ts = registry_stat.st_mtime;
}
- if (stat(registry_bin_path, ®istry_stat) == 0) {
+ if (stat (registry_bin_path, ®istry_stat) == 0) {
if (registry_ts < registry_stat.st_mtime) {
registry_ts = registry_stat.st_mtime;
}
}
- if (stat(cache_path, &cache_stat) == 0) {
+ if (stat (cache_path, &cache_stat) == 0) {
cache_ts = cache_stat.st_mtime;
}
- g_free(registry_bin_path);
- g_free(registry_xml_path);
+ g_free (registry_bin_path);
+ g_free (registry_xml_path);
return (registry_ts != 0 && cache_ts > registry_ts);
}
@@ -87,7 +87,7 @@ get_codecs_cache_path (FsMediaType media_type, GError **error) {
cache_path = g_build_filename (g_get_home_dir (), ".farsight",
"codecs.audio." HOST_CPU ".cache", NULL);
}
- } else if(media_type == FS_MEDIA_TYPE_VIDEO) {
+ } else if (media_type == FS_MEDIA_TYPE_VIDEO) {
cache_path = g_strdup (g_getenv ("FS_VIDEO_CODECS_CACHE"));
if (cache_path == NULL) {
cache_path = g_build_filename (g_get_home_dir (), ".farsight",
@@ -105,23 +105,23 @@ get_codecs_cache_path (FsMediaType media_type, GError **error) {
static gboolean
read_codec_blueprint_uint (gchar **in, gsize *size, guint *val) {
- if (*size < sizeof(guint))
+ if (*size < sizeof (guint))
return FALSE;
*val = *((guint *) *in);
- *in += sizeof(guint);
- *size -= sizeof(guint);
+ *in += sizeof (guint);
+ *size -= sizeof (guint);
return TRUE;
}
static gboolean
read_codec_blueprint_int (gchar **in, gsize *size, gint *val) {
- if (*size < sizeof(gint))
+ if (*size < sizeof (gint))
return FALSE;
*val = *((gint *) *in);
- *in += sizeof(gint);
- *size -= sizeof(gint);
+ *in += sizeof (gint);
+ *size -= sizeof (gint);
return TRUE;
}
@@ -144,7 +144,7 @@ read_codec_blueprint_string (gchar **in, gsize *size, gchar **str) {
}
-#define READ_CHECK(x) if(!x) goto error;
+#define READ_CHECK(x) if (!x) goto error;
static CodecBlueprint *
load_codec_blueprint (FsMediaType media_type, gchar **in, gsize *size) {
@@ -167,7 +167,7 @@ load_codec_blueprint (FsMediaType media_type, gchar **in, gsize *size) {
READ_CHECK (read_codec_blueprint_int (in, size, &tmp_size));
- for(i = 0; i < tmp_size; i++) {
+ for (i = 0; i < tmp_size; i++) {
FsCodecParameter *param = g_new0 (FsCodecParameter, 1);
READ_CHECK (read_codec_blueprint_string (in, size, &(param->name)));
READ_CHECK (read_codec_blueprint_string (in, size, &(param->value)));
@@ -184,7 +184,7 @@ load_codec_blueprint (FsMediaType media_type, gchar **in, gsize *size) {
g_free (tmp);
READ_CHECK (read_codec_blueprint_int (in, size, &tmp_size));
- for(i = 0; i < tmp_size; i++) {
+ for (i = 0; i < tmp_size; i++) {
int j, tmp_size2;
GList *tmplist = NULL;
@@ -201,7 +201,7 @@ load_codec_blueprint (FsMediaType media_type, gchar **in, gsize *size) {
}
READ_CHECK (read_codec_blueprint_int (in, size, &tmp_size));
- for(i = 0; i < tmp_size; i++) {
+ for (i = 0; i < tmp_size; i++) {
int j, tmp_size2;
GList *tmplist = NULL;
@@ -259,7 +259,7 @@ load_codecs_cache (FsMediaType media_type, GError **error)
if (media_type == FS_MEDIA_TYPE_AUDIO) {
magic_media = 'A';
- } else if(media_type == FS_MEDIA_TYPE_VIDEO) {
+ } else if (media_type == FS_MEDIA_TYPE_VIDEO) {
magic_media = 'V';
} else {
g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS,
@@ -267,14 +267,14 @@ load_codecs_cache (FsMediaType media_type, GError **error)
return FALSE;
}
- cache_path = get_codecs_cache_path(media_type, error);
+ cache_path = get_codecs_cache_path (media_type, error);
if (!cache_path)
return FALSE;
- if (!codecs_cache_valid(cache_path)) {
+ if (!codecs_cache_valid (cache_path)) {
GST_DEBUG ("Codecs cache %s is outdated or does not exist", cache_path);
- g_free(cache_path);
+ g_free (cache_path);
return FALSE;
}
@@ -286,7 +286,7 @@ load_codecs_cache (FsMediaType media_type, GError **error)
err ? err->message: "unknown error");
g_clear_error (&err);
- if(!g_file_get_contents (cache_path, &contents, &size, error))
+ if (!g_file_get_contents (cache_path, &contents, &size, error))
goto error;
} else {
if ((contents = g_mapped_file_get_contents (mapped)) == NULL) {
@@ -307,9 +307,9 @@ load_codecs_cache (FsMediaType media_type, GError **error)
goto error;
}
- memcpy (magic, in, sizeof(magic));
- in += sizeof(magic);
- size -= sizeof(magic);
+ memcpy (magic, in, sizeof (magic));
+ in += sizeof (magic);
+ size -= sizeof (magic);
if (magic[0] != 'F' ||
magic[1] != 'S' ||
@@ -322,15 +322,15 @@ load_codecs_cache (FsMediaType media_type, GError **error)
goto error;
}
- if (size < sizeof(gint)) {
+ if (size < sizeof (gint)) {
g_set_error (error, FS_ERROR, FS_ERROR_INTERNAL,
- "Cache file corrupt (size: %"G_GSIZE_FORMAT" < sizeof(int))", size);
+ "Cache file corrupt (size: %"G_GSIZE_FORMAT" < sizeof (int))", size);
goto error;
}
num_blueprints = *((gint *) in);
- in += sizeof(gint);
- size -= sizeof(gint);
+ in += sizeof (gint);
+ size -= sizeof (gint);
for (i = 0; i < num_blueprints; i++) {
CodecBlueprint *blueprint = load_codec_blueprint (media_type, &in, &size);
@@ -359,11 +359,11 @@ load_codecs_cache (FsMediaType media_type, GError **error)
return blueprints;
}
-#define WRITE_CHECK(x) if(!x) return FALSE;
+#define WRITE_CHECK(x) if (!x) return FALSE;
static gboolean
write_codec_blueprint_int (int fd, gint val) {
- return write (fd, &val, sizeof(gint)) == sizeof(gint);
+ return write (fd, &val, sizeof (gint)) == sizeof (gint);
}
static gboolean
@@ -410,13 +410,13 @@ save_codec_blueprint (int fd, CodecBlueprint *codec_blueprint) {
walk = codec_blueprint->send_pipeline_factory;
size = g_list_length (walk);
- if (write (fd, &size, sizeof(gint)) != sizeof(gint))
+ if (write (fd, &size, sizeof (gint)) != sizeof (gint))
return FALSE;
for (; walk; walk = g_list_next (walk)) {
GList *walk2 = walk->data;
size = g_list_length (walk2);
- if (write (fd, &size, sizeof(gint)) != sizeof(gint))
+ if (write (fd, &size, sizeof (gint)) != sizeof (gint))
return FALSE;
for (; walk2; walk2 = g_list_next (walk2)) {
GstElementFactory *fact = walk2->data;
@@ -427,13 +427,13 @@ save_codec_blueprint (int fd, CodecBlueprint *codec_blueprint) {
walk = codec_blueprint->receive_pipeline_factory;
size = g_list_length (walk);
- if (write (fd, &size, sizeof(gint)) != sizeof(gint))
+ if (write (fd, &size, sizeof (gint)) != sizeof (gint))
return FALSE;
for (; walk; walk = g_list_next (walk)) {
GList *walk2 = walk->data;
size = g_list_length (walk2);
- if (write (fd, &size, sizeof(gint)) != sizeof(gint))
+ if (write (fd, &size, sizeof (gint)) != sizeof (gint))
return FALSE;
for (; walk2; walk2 = g_list_next (walk2)) {
GstElementFactory *fact = walk2->data;
@@ -447,7 +447,7 @@ save_codec_blueprint (int fd, CodecBlueprint *codec_blueprint) {
gboolean
-save_codecs_cache(FsMediaType media_type, GList *blueprints)
+save_codecs_cache (FsMediaType media_type, GList *blueprints)
{
gchar *cache_path;
GList *item;
@@ -456,7 +456,7 @@ save_codecs_cache(FsMediaType media_type, GList *blueprints)
int size;
gchar magic[8] = {0};
- cache_path = get_codecs_cache_path(media_type, NULL);
+ cache_path = get_codecs_cache_path (media_type, NULL);
if (!cache_path)
return FALSE;
@@ -479,7 +479,7 @@ save_codecs_cache(FsMediaType media_type, GList *blueprints)
fd = g_mkstemp (tmp_path);
if (fd == -1) {
- GST_DEBUG ("Unable to save codecs cache. g_mkstemp() failed: %s",
+ GST_DEBUG ("Unable to save codecs cache. g_mkstemp () failed: %s",
g_strerror (errno));
g_free (tmp_path);
g_free (cache_path);
@@ -494,7 +494,7 @@ save_codecs_cache(FsMediaType media_type, GList *blueprints)
if (media_type == FS_MEDIA_TYPE_AUDIO) {
magic[2] = 'A';
- } else if(media_type == FS_MEDIA_TYPE_VIDEO) {
+ } else if (media_type == FS_MEDIA_TYPE_VIDEO) {
magic[2] = 'V';
}
@@ -507,7 +507,7 @@ save_codecs_cache(FsMediaType media_type, GList *blueprints)
size = g_list_length (blueprints);
- if (write (fd, &size, sizeof(gint)) != sizeof(gint))
+ if (write (fd, &size, sizeof (gint)) != sizeof (gint))
return FALSE;
diff --git a/gst/fsrtpconference/fs-rtp-codec-cache.h b/gst/fsrtpconference/fs-rtp-codec-cache.h
index 9d1ee25..983d26e 100644
--- a/gst/fsrtpconference/fs-rtp-codec-cache.h
+++ b/gst/fsrtpconference/fs-rtp-codec-cache.h
@@ -31,8 +31,8 @@
G_BEGIN_DECLS
-GList *load_codecs_cache(FsMediaType media_type, GError **error);
-gboolean save_codecs_cache(FsMediaType media_type, GList *codec_blueprints);
+GList *load_codecs_cache (FsMediaType media_type, GError **error);
+gboolean save_codecs_cache (FsMediaType media_type, GList *codec_blueprints);
G_END_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-conference.c b/gst/fsrtpconference/fs-rtp-conference.c
index 172f9b2..3826bcf 100644
--- a/gst/fsrtpconference/fs-rtp-conference.c
+++ b/gst/fsrtpconference/fs-rtp-conference.c
@@ -405,7 +405,7 @@ _rtpbin_request_pt_map (GstElement *element, guint session_id,
caps = fs_rtp_session_request_pt_map (session, pt);
g_object_unref (session);
} else {
- GST_WARNING_OBJECT(self,"GstRtpBin %p tried to request the caps for "
+ GST_WARNING_OBJECT (self,"GstRtpBin %p tried to request the caps for "
" payload type %u for non-existent session %u",
element, pt, session_id);
}
@@ -486,7 +486,7 @@ fs_rtp_conference_get_session_by_id_locked (FsRtpConference *self,
FsRtpSession *session = item->data;
if (session->id == session_id) {
- g_object_ref(session);
+ g_object_ref (session);
break;
}
}
@@ -685,7 +685,7 @@ fs_rtp_conference_handle_message (
fs_rtp_session_associate_ssrc_cname (session, ssrc, cname);
g_object_unref (session);
} else {
- GST_WARNING_OBJECT(self,"Our GstRtpBin announced a new association"
+ GST_WARNING_OBJECT (self,"Our GstRtpBin announced a new association"
"for non-existent session %u for ssrc: %u and cname %s",
session_id, ssrc, cname);
}
diff --git a/gst/fsrtpconference/fs-rtp-conference.h b/gst/fsrtpconference/fs-rtp-conference.h
index cd8e3a4..386a319 100644
--- a/gst/fsrtpconference/fs-rtp-conference.h
+++ b/gst/fsrtpconference/fs-rtp-conference.h
@@ -31,7 +31,7 @@
G_BEGIN_DECLS
#define FS_TYPE_RTP_CONFERENCE \
- (fs_rtp_conference_get_type())
+ (fs_rtp_conference_get_type ())
#define FS_RTP_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),FS_TYPE_RTP_CONFERENCE,FsRtpConference))
#define FS_RTP_CONFERENCE_CLASS(klass) \
@@ -64,7 +64,7 @@ struct _FsRtpConferenceClass
FsBaseConferenceClass parent_class;
};
-GType fs_rtp_conference_get_type(void);
+GType fs_rtp_conference_get_type (void);
GST_DEBUG_CATEGORY_EXTERN (fsrtpconference_debug);
diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
index c342940..a9328b5 100644
--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
+++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
@@ -94,7 +94,7 @@ debug_pipeline (GList *pipeline)
GList *walk2;
for (walk2 = g_list_first (walk->data); walk2; walk2 = g_list_next (walk2))
GST_DEBUG ("%p:%d:%s ", walk2->data,
- GST_OBJECT_REFCOUNT_VALUE(GST_OBJECT (walk2->data)),
+ GST_OBJECT_REFCOUNT_VALUE (GST_OBJECT (walk2->data)),
gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (walk2->data)));
GST_DEBUG ("--");
}
@@ -109,7 +109,7 @@ debug_codec_cap (CodecCap *codec_cap)
{
caps = gst_caps_to_string (codec_cap->caps);
GST_LOG ("%p:%d:media_caps %s\n", codec_cap->caps,
- GST_CAPS_REFCOUNT_VALUE(codec_cap->caps),
+ GST_CAPS_REFCOUNT_VALUE (codec_cap->caps),
caps);
g_free (caps);
}
@@ -118,7 +118,7 @@ debug_codec_cap (CodecCap *codec_cap)
{
caps = gst_caps_to_string (codec_cap->rtp_caps);
GST_LOG ("%p:%d:rtp_caps %s\n", codec_cap->rtp_caps,
- GST_CAPS_REFCOUNT_VALUE(codec_cap->rtp_caps), caps);
+ GST_CAPS_REFCOUNT_VALUE (codec_cap->rtp_caps), caps);
g_free (caps);
g_assert (gst_caps_get_size (codec_cap->rtp_caps) == 1);
}
@@ -227,9 +227,9 @@ fs_rtp_blueprints_get (FsMediaType media_type, GError **error)
if (codecs_lists_ref[media_type] > 1)
return list_codec_blueprints[media_type];
- list_codec_blueprints[media_type] = load_codecs_cache(media_type, NULL);
+ list_codec_blueprints[media_type] = load_codecs_cache (media_type, NULL);
if (list_codec_blueprints[media_type]) {
- GST_DEBUG("Loaded codec blueprints from cache file");
+ GST_DEBUG ("Loaded codec blueprints from cache file");
return list_codec_blueprints[media_type];
}
@@ -271,7 +271,7 @@ fs_rtp_blueprints_get (FsMediaType media_type, GError **error)
ret = create_codec_lists (media_type, recv_list, send_list);
/* Save the codecs blueprint cache */
- save_codecs_cache(media_type, list_codec_blueprints[media_type]);
+ save_codecs_cache (media_type, list_codec_blueprints[media_type]);
out:
if (recv_list)
@@ -293,13 +293,13 @@ create_codec_lists (FsMediaType media_type,
* only sendable or only receivable */
duplex_list = codec_cap_list_intersect (recv_list, send_list);
- if(!duplex_list) {
+ if (!duplex_list) {
GST_WARNING ("There are no send/recv codecs");
return FALSE;
}
GST_LOG ("*******Intersection of send_list and recv_list");
- debug_codec_cap_list(duplex_list);
+ debug_codec_cap_list (duplex_list);
duplex_list = remove_dynamic_duplicates (duplex_list);
@@ -349,7 +349,7 @@ validate_h263_codecs (CodecCap *codec_cap)
if (!h263version || !encoding_name)
return FALSE;
- if( !strcmp (h263version, "h263"))
+ if ( !strcmp (h263version, "h263"))
{
/* baseline H263 can only be encoding name H263 or H263-1998 */
if (strcmp (encoding_name, "H263") &&
@@ -626,7 +626,7 @@ klass_contains (const gchar *klass, const gchar *needle)
{
gchar *found = strstr (klass, needle);
- if(!found)
+ if (!found)
return FALSE;
if (found != klass && *(found-1) != '/')
return FALSE;
@@ -690,7 +690,7 @@ detect_send_codecs (GstCaps *caps)
}
else {
GST_LOG ("**Payloaders");
- debug_codec_cap_list(payloaders);
+ debug_codec_cap_list (payloaders);
}
/* find all encoders based on is_encoder filter */
@@ -703,7 +703,7 @@ detect_send_codecs (GstCaps *caps)
}
else {
GST_LOG ("**Encoders");
- debug_codec_cap_list(encoders);
+ debug_codec_cap_list (encoders);
}
/* create intersection list of codecs common
@@ -716,7 +716,7 @@ detect_send_codecs (GstCaps *caps)
}
else {
GST_LOG ("**intersection of payloaders and encoders");
- debug_codec_cap_list(send_list);
+ debug_codec_cap_list (send_list);
}
codec_cap_list_free (payloaders);
@@ -746,7 +746,7 @@ detect_recv_codecs (GstCaps *caps)
}
else {
GST_LOG ("**Depayloaders");
- debug_codec_cap_list(depayloaders);
+ debug_codec_cap_list (depayloaders);
}
/* find all decoders based on is_decoder filter */
@@ -760,7 +760,7 @@ detect_recv_codecs (GstCaps *caps)
}
else {
GST_LOG ("**Decoders");
- debug_codec_cap_list(decoders);
+ debug_codec_cap_list (decoders);
}
/* create intersection list of codecs common
@@ -773,7 +773,7 @@ detect_recv_codecs (GstCaps *caps)
}
else {
GST_LOG ("**intersection of depayloaders and decoders");
- debug_codec_cap_list(recv_list);
+ debug_codec_cap_list (recv_list);
}
codec_cap_list_free (depayloaders);
@@ -1069,7 +1069,7 @@ create_codec_cap_list (GstElementFactory *factory,
if (padtemplate->direction != direction)
continue;
- if (GST_PAD_TEMPLATE_PRESENCE(padtemplate) != GST_PAD_ALWAYS) {
+ if (GST_PAD_TEMPLATE_PRESENCE (padtemplate) != GST_PAD_ALWAYS) {
continue;
}
@@ -1156,7 +1156,7 @@ create_codec_cap_list (GstElementFactory *factory,
entry->rtp_caps = rtp_caps;
/* This shouldn't happen, its we're looking at rtp elements
* or we're not */
- g_assert_not_reached();
+ g_assert_not_reached ();
}
gst_caps_unref (rtp_caps);
}
diff --git a/gst/fsrtpconference/fs-rtp-dtmf-event-source.c b/gst/fsrtpconference/fs-rtp-dtmf-event-source.c
index 9367556..1db191c 100644
--- a/gst/fsrtpconference/fs-rtp-dtmf-event-source.c
+++ b/gst/fsrtpconference/fs-rtp-dtmf-event-source.c
@@ -52,7 +52,7 @@ struct _FsRtpDtmfEventSourcePrivate {
static FsRtpSpecialSourceClass *parent_class = NULL;
-G_DEFINE_TYPE(FsRtpDtmfEventSource, fs_rtp_dtmf_event_source,
+G_DEFINE_TYPE (FsRtpDtmfEventSource, fs_rtp_dtmf_event_source,
FS_TYPE_RTP_SPECIAL_SOURCE);
#define FS_RTP_DTMF_EVENT_SOURCE_GET_PRIVATE(o) \
diff --git a/gst/fsrtpconference/fs-rtp-dtmf-event-source.h b/gst/fsrtpconference/fs-rtp-dtmf-event-source.h
index 675bd23..f4fe098 100644
--- a/gst/fsrtpconference/fs-rtp-dtmf-event-source.h
+++ b/gst/fsrtpconference/fs-rtp-dtmf-event-source.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RTP_DTMF_EVENT_SOURCE \
- (fs_rtp_dtmf_event_source_get_type())
+ (fs_rtp_dtmf_event_source_get_type ())
#define FS_RTP_DTMF_EVENT_SOURCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RTP_DTMF_EVENT_SOURCE, \
FsRtpDtmfEventSource))
diff --git a/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h
index f85dc7b..211006b 100644
--- a/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h
+++ b/gst/fsrtpconference/fs-rtp-dtmf-sound-source.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RTP_DTMF_SOUND_SOURCE \
- (fs_rtp_dtmf_sound_source_get_type())
+ (fs_rtp_dtmf_sound_source_get_type ())
#define FS_RTP_DTMF_SOUND_SOURCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RTP_DTMF_SOUND_SOURCE, \
FsRtpDtmfSoundSource))
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 4c7ae33..3a355d6 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -148,7 +148,7 @@ struct _FsRtpSessionPrivate
gboolean disposed;
};
-G_DEFINE_TYPE(FsRtpSession, fs_rtp_session, FS_TYPE_SESSION);
+G_DEFINE_TYPE (FsRtpSession, fs_rtp_session, FS_TYPE_SESSION);
#define FS_RTP_SESSION_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_RTP_SESSION, FsRtpSessionPrivate))
@@ -655,7 +655,7 @@ fs_rtp_session_set_property (GObject *object,
} else {
GST_WARNING ("Invalid new codec configurations");
- fs_codec_list_destroy(new_local_codecs_configuration);
+ fs_codec_list_destroy (new_local_codecs_configuration);
}
}
break;
@@ -693,7 +693,7 @@ fs_rtp_session_constructed (GObject *object)
if (self->id == 0) {
g_error ("You can no instantiate this element directly, you MUST"
- " call fs_rtp_session_new()");
+ " call fs_rtp_session_new ()");
return;
}
@@ -1202,9 +1202,9 @@ fs_rtp_session_new_stream (FsSession *session,
*
* This function will start sending a telephony event (such as a DTMF
* tone) on the #FsRtpSession. You have to call the function
- * #fs_rtp_session_stop_telephony_event() to stop it.
+ * #fs_rtp_session_stop_telephony_event () to stop it.
* This function will use any available method, if you want to use a specific
- * method only, use #fs_rtp_session_start_telephony_event_full()
+ * method only, use #fs_rtp_session_start_telephony_event_full ()
*
* Returns: %TRUE if sucessful, it can return %FALSE if the #FsStream
* does not support this telephony event.
@@ -1230,7 +1230,7 @@ fs_rtp_session_start_telephony_event (FsSession *session, guint8 event,
* @method: The method used to send the event
*
* This function will stop sending a telephony event started by
- * #fs_rtp_session_start_telephony_event(). If the event was being sent
+ * #fs_rtp_session_start_telephony_event (). If the event was being sent
* for less than 50ms, it will be sent for 50ms minimum. If the
* duration was a positive and the event is not over, it will cut it
* short.
@@ -1262,7 +1262,7 @@ fs_rtp_session_stop_telephony_event (FsSession *session, FsDTMFMethod method)
* session. The given #FsCodec must be taken directly from the #negotiated-codecs
* property of the session. If the given codec is not in the negotiated codecs
* list, @error will be set and %FALSE will be returned. The @send_codec will be
- * copied so it must be free'd using fs_codec_destroy() when done.
+ * copied so it must be free'd using fs_codec_destroy () when done.
*
* Returns: %FALSE if the send codec couldn't be set.
*/
@@ -1379,7 +1379,7 @@ _get_request_pad_and_link (GstElement *tee_funnel, const gchar *tee_funnel_name,
gst_object_unref (requestpad);
gst_object_unref (transpad);
- if (GST_PAD_LINK_FAILED(ret)) {
+ if (GST_PAD_LINK_FAILED (ret)) {
g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
"Can not link the %s to the transmitter %s", tee_funnel_name,
(direction == GST_PAD_SINK) ? "sink" : "src");
@@ -1425,33 +1425,33 @@ fs_rtp_session_get_new_stream_transmitter (FsRtpSession *self,
g_object_get (transmitter, "gst-sink", &sink, "gst-src", &src, NULL);
- if(!gst_bin_add (GST_BIN (self->priv->conference), sink)) {
+ if (!gst_bin_add (GST_BIN (self->priv->conference), sink)) {
g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
"Could not add the transmitter sink for %s to the conference",
transmitter_name);
goto error;
}
- if(!gst_bin_add (GST_BIN (self->priv->conference), src)) {
+ if (!gst_bin_add (GST_BIN (self->priv->conference), src)) {
g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
"Could not add the transmitter src for %s to the conference",
transmitter_name);
goto error;
}
- if(!_get_request_pad_and_link (self->priv->transmitter_rtp_tee,
+ if (!_get_request_pad_and_link (self->priv->transmitter_rtp_tee,
"rtp tee", sink, "sink1", GST_PAD_SINK, error))
goto error;
- if(!_get_request_pad_and_link (self->priv->transmitter_rtcp_tee,
+ if (!_get_request_pad_and_link (self->priv->transmitter_rtcp_tee,
"rtcp tee", sink, "sink2", GST_PAD_SINK, error))
goto error;
- if(!_get_request_pad_and_link (self->priv->transmitter_rtp_funnel,
+ if (!_get_request_pad_and_link (self->priv->transmitter_rtp_funnel,
"rtp funnel", src, "src1", GST_PAD_SRC, error))
goto error;
- if(!_get_request_pad_and_link (self->priv->transmitter_rtcp_funnel,
+ if (!_get_request_pad_and_link (self->priv->transmitter_rtcp_funnel,
"rtcp funnel", src, "src2", GST_PAD_SRC, error))
goto error;
@@ -2339,7 +2339,7 @@ _send_src_pad_have_data_callback (GstPad *pad, GstMiniObject *miniobj,
gboolean ret = TRUE;
FS_RTP_SESSION_LOCK (self);
- codec = fs_rtp_session_select_send_codec_locked(self, &blueprint, &error);
+ codec = fs_rtp_session_select_send_codec_locked (self, &blueprint, &error);
if (!codec)
{
@@ -2442,7 +2442,7 @@ fs_rtp_session_verify_send_codec_bin_locked (FsRtpSession *self, GError **error)
gboolean ret = FALSE;
GError *local_gerror = NULL;
- codec = fs_rtp_session_select_send_codec_locked(self, &blueprint, error);
+ codec = fs_rtp_session_select_send_codec_locked (self, &blueprint, error);
if (!codec)
goto done;
@@ -2612,9 +2612,9 @@ fs_rtp_session_associate_ssrc_cname (FsRtpSession *session,
}
while (
- g_signal_handlers_disconnect_by_func(substream, "error", session) > 0) {}
+ g_signal_handlers_disconnect_by_func (substream, "error", session) > 0) {}
while (
- g_signal_handlers_disconnect_by_func(substream, "no-rtcp-timedout", session) > 0) {}
+ g_signal_handlers_disconnect_by_func (substream, "no-rtcp-timedout", session) > 0) {}
if (!fs_rtp_stream_add_substream (stream, substream, &error))
fs_session_emit_error (FS_SESSION (session), error->code,
@@ -2660,9 +2660,9 @@ _substream_no_rtcp_timedout_cb (FsRtpSubStream *substream,
substream);
while (
- g_signal_handlers_disconnect_by_func(substream, "error", session) > 0) {}
+ g_signal_handlers_disconnect_by_func (substream, "error", session) > 0) {}
while (
- g_signal_handlers_disconnect_by_func(substream, "no-rtcp-timedout", session) > 0) {}
+ g_signal_handlers_disconnect_by_func (substream, "no-rtcp-timedout", session) > 0) {}
if (!fs_rtp_stream_add_substream (
g_list_first (session->priv->streams)->data,
diff --git a/gst/fsrtpconference/fs-rtp-session.h b/gst/fsrtpconference/fs-rtp-session.h
index e172188..ce1ab88 100644
--- a/gst/fsrtpconference/fs-rtp-session.h
+++ b/gst/fsrtpconference/fs-rtp-session.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RTP_SESSION \
- (fs_rtp_session_get_type())
+ (fs_rtp_session_get_type ())
#define FS_RTP_SESSION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RTP_SESSION, FsRtpSession))
#define FS_RTP_SESSION_CLASS(klass) \
diff --git a/gst/fsrtpconference/fs-rtp-special-source.h b/gst/fsrtpconference/fs-rtp-special-source.h
index 8763c8d..8ca640c 100644
--- a/gst/fsrtpconference/fs-rtp-special-source.h
+++ b/gst/fsrtpconference/fs-rtp-special-source.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RTP_SPECIAL_SOURCE \
- (fs_rtp_special_source_get_type())
+ (fs_rtp_special_source_get_type ())
#define FS_RTP_SPECIAL_SOURCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RTP_SPECIAL_SOURCE, \
FsRtpSpecialSource))
diff --git a/gst/fsrtpconference/fs-rtp-stream.h b/gst/fsrtpconference/fs-rtp-stream.h
index 86c324f..0fdba97 100644
--- a/gst/fsrtpconference/fs-rtp-stream.h
+++ b/gst/fsrtpconference/fs-rtp-stream.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RTP_STREAM \
- (fs_rtp_stream_get_type())
+ (fs_rtp_stream_get_type ())
#define FS_RTP_STREAM(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RTP_STREAM, FsRtpStream))
#define FS_RTP_STREAM_CLASS(klass) \
diff --git a/gst/fsrtpconference/fs-rtp-substream.h b/gst/fsrtpconference/fs-rtp-substream.h
index 49f7941..7a1ec8a 100644
--- a/gst/fsrtpconference/fs-rtp-substream.h
+++ b/gst/fsrtpconference/fs-rtp-substream.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RTP_SUB_STREAM \
- (fs_rtp_sub_stream_get_type())
+ (fs_rtp_sub_stream_get_type ())
#define FS_RTP_SUB_STREAM(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RTP_SUB_STREAM, FsRtpSubStream))
#define FS_RTP_SUB_STREAM_CLASS(klass) \
diff --git a/gst/funnel/gstfsfunnel.h b/gst/funnel/gstfsfunnel.h
index c2c2c81..adb26a6 100644
--- a/gst/funnel/gstfsfunnel.h
+++ b/gst/funnel/gstfsfunnel.h
@@ -31,7 +31,7 @@
G_BEGIN_DECLS
#define FS_TYPE_FUNNEL \
- (fs_funnel_get_type())
+ (fs_funnel_get_type ())
#define FS_FUNNEL(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),FS_TYPE_FUNNEL,FsFunnel))
#define FS_FUNNEL_CLASS(klass) \
diff --git a/tests/check/main/rtpconference.c b/tests/check/main/rtpconference.c
index 77aa19b..01090b8 100644
--- a/tests/check/main/rtpconference.c
+++ b/tests/check/main/rtpconference.c
@@ -410,7 +410,7 @@ _new_local_candidate (FsStream *stream, FsCandidate *candidate,
ts_fail ("Error while adding candidate: (%s:%d) %s",
g_quark_to_string (error->domain), error->code, error->message);
- ts_fail_unless(ret == TRUE, "No detailed error from add_remote_candidate");
+ ts_fail_unless (ret == TRUE, "No detailed error from add_remote_candidate");
}
diff --git a/tests/check/transmitter/multicast.c b/tests/check/transmitter/multicast.c
index 496a9fa..8f91647 100644
--- a/tests/check/transmitter/multicast.c
+++ b/tests/check/transmitter/multicast.c
@@ -266,7 +266,7 @@ GST_START_TEST (test_multicasttransmitter_run_local_candidates)
return;
}
- memset (params, 0, sizeof(GParameter) * 1);
+ memset (params, 0, sizeof (GParameter) * 1);
candidate = fs_candidate_new ("L1", FS_COMPONENT_RTP, FS_CANDIDATE_TYPE_HOST,
FS_NETWORK_PROTOCOL_UDP, address, 0);
diff --git a/tests/check/transmitter/rawudp.c b/tests/check/transmitter/rawudp.c
index 51a632d..bad3af9 100644
--- a/tests/check/transmitter/rawudp.c
+++ b/tests/check/transmitter/rawudp.c
@@ -135,7 +135,7 @@ _new_local_candidate (FsStreamTransmitter *st, FsCandidate *candidate,
ts_fail ("Error while adding candidate: (%s:%d) %s",
g_quark_to_string (error->domain), error->code, error->message);
- ts_fail_unless(ret == TRUE, "No detailed error from add_remote_candidate");
+ ts_fail_unless (ret == TRUE, "No detailed error from add_remote_candidate");
}
@@ -303,7 +303,7 @@ GST_START_TEST (test_rawudptransmitter_run_invalid_stun)
* Hopefully not one is runing a stun server on local port 7777
*/
- memset (params, 0, sizeof(GParameter) * 3);
+ memset (params, 0, sizeof (GParameter) * 3);
params[0].name = "stun-ip";
g_value_init (¶ms[0].value, G_TYPE_STRING);
@@ -326,7 +326,7 @@ GST_START_TEST (test_rawudptransmitter_run_stunserver_dot_org)
{
GParameter params[3];
- memset (params, 0, sizeof(GParameter) * 3);
+ memset (params, 0, sizeof (GParameter) * 3);
params[0].name = "stun-ip";
g_value_init (¶ms[0].value, G_TYPE_STRING);
@@ -351,7 +351,7 @@ GST_START_TEST (test_rawudptransmitter_run_local_candidates)
GList *list = NULL;
FsCandidate *candidate;
- memset (params, 0, sizeof(GParameter) * 1);
+ memset (params, 0, sizeof (GParameter) * 1);
candidate = g_new0 (FsCandidate, 1);
candidate->candidate_id = g_strdup ("L1");
diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.h b/transmitters/multicast/fs-multicast-stream-transmitter.h
index de4af31..f260a68 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.h
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_MULTICAST_STREAM_TRANSMITTER \
- (fs_multicast_stream_transmitter_get_type())
+ (fs_multicast_stream_transmitter_get_type ())
#define FS_MULTICAST_STREAM_TRANSMITTER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_MULTICAST_STREAM_TRANSMITTER, \
FsMulticastStreamTransmitter))
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index 84e7a87..b268685 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -471,7 +471,7 @@ fs_multicast_transmitter_new_stream_transmitter (FsTransmitter *transmitter,
* The UdpSock structure is a ref-counted pseudo-object use to represent
* one local_ip:port:ttl:multicast_ip quatuor on which we listen and send,
* so it includes a udpsrc and a multiudpsink. It represents one BSD socket.
- * If two UdpSock only differ by their TTL, only the first will have
+ * If two UdpSock only differ by their TTL, only the first will have
*/
struct _UdpSock {
@@ -518,7 +518,7 @@ _ip_string_into_sockaddr_in (const gchar *ip_as_string,
gai_strerror (retval));
return FALSE;
}
- memcpy (sockaddr_in, result->ai_addr, sizeof(struct sockaddr_in));
+ memcpy (sockaddr_in, result->ai_addr, sizeof (struct sockaddr_in));
freeaddrinfo (result);
return TRUE;
@@ -546,14 +546,15 @@ _bind_port (
if (!_ip_string_into_sockaddr_in (multicast_ip, &address, error))
goto error;
- memcpy (&mreqn.imr_multiaddr, &address.sin_addr, sizeof(mreqn.imr_multiaddr));
+ memcpy (&mreqn.imr_multiaddr, &address.sin_addr,
+ sizeof (mreqn.imr_multiaddr));
if (local_ip)
{
struct sockaddr_in tmpaddr;
if (!_ip_string_into_sockaddr_in (local_ip, &tmpaddr, error))
goto error;
- memcpy (&mreqn.imr_address, &tmpaddr.sin_addr, sizeof(mreqn.imr_address));
+ memcpy (&mreqn.imr_address, &tmpaddr.sin_addr, sizeof (mreqn.imr_address));
}
else
{
diff --git a/transmitters/multicast/fs-multicast-transmitter.h b/transmitters/multicast/fs-multicast-transmitter.h
index 27c2709..698b70a 100644
--- a/transmitters/multicast/fs-multicast-transmitter.h
+++ b/transmitters/multicast/fs-multicast-transmitter.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_MULTICAST_TRANSMITTER \
- (fs_multicast_transmitter_get_type())
+ (fs_multicast_transmitter_get_type ())
#define FS_MULTICAST_TRANSMITTER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_MULTICAST_TRANSMITTER, \
FsMulticastTransmitter))
diff --git a/transmitters/rawudp/fs-interfaces.c b/transmitters/rawudp/fs-interfaces.c
index 0433fd5..8dc9de8 100644
--- a/transmitters/rawudp/fs-interfaces.c
+++ b/transmitters/rawudp/fs-interfaces.c
@@ -58,7 +58,7 @@ GST_DEBUG_CATEGORY_EXTERN (fs_rawudp_transmitter_debug);
*/
#ifdef HAVE_GETIFADDRS
GList *
-farsight_get_local_interfaces(void)
+farsight_get_local_interfaces (void)
{
GList *interfaces = NULL;
struct ifaddrs *ifa, *results;
@@ -76,8 +76,8 @@ farsight_get_local_interfaces(void)
if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET)
continue;
- GST_DEBUG("Found interface : %s", ifa->ifa_name);
- interfaces = g_list_prepend (interfaces, g_strdup(ifa->ifa_name));
+ GST_DEBUG ("Found interface : %s", ifa->ifa_name);
+ interfaces = g_list_prepend (interfaces, g_strdup (ifa->ifa_name));
}
freeifaddrs (results);
@@ -106,7 +106,7 @@ farsight_get_local_interfaces (void)
/* Loop and get each interface the system has, one by one... */
do {
- size += sizeof(struct ifreq);
+ size += sizeof (struct ifreq);
/* realloc buffer size until no overflow occurs */
if (NULL == (ifc.ifc_req = realloc (ifc.ifc_req, size))) {
GST_ERROR ("Out of memory while allocation interface configuration structure");
@@ -129,11 +129,11 @@ farsight_get_local_interfaces (void)
(gchar *) ifr < (gchar *) ifc.ifc_req + ifc.ifc_len;
++ifr) {
GST_DEBUG ("Found interface : %s", ifr->ifr_name);
- interfaces = g_list_prepend (interfaces, g_strdup(ifr->ifr_name));
+ interfaces = g_list_prepend (interfaces, g_strdup (ifr->ifr_name));
}
free (ifc.ifc_req);
- close(sockfd);
+ close (sockfd);
return interfaces;
}
@@ -197,14 +197,14 @@ farsight_get_local_ips (gboolean include_loopback)
sa = (struct sockaddr_in *) ifa->ifa_addr;
- GST_DEBUG("Interface: %s", ifa->ifa_name);
- GST_DEBUG("IP Address: %s", inet_ntoa(sa->sin_addr));
+ GST_DEBUG ("Interface: %s", ifa->ifa_name);
+ GST_DEBUG ("IP Address: %s", inet_ntoa (sa->sin_addr));
if ((ifa->ifa_flags & IFF_LOOPBACK) == IFF_LOOPBACK)
{
if (include_loopback)
loopback = g_strdup (inet_ntoa (sa->sin_addr));
else
- GST_DEBUG("Ignoring loopback interface");
+ GST_DEBUG ("Ignoring loopback interface");
}
else
{
@@ -237,7 +237,7 @@ farsight_get_local_ips (gboolean include_loopback)
gchar *loopback = NULL;
if ((sockfd = socket (AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
- GST_ERROR("Cannot open socket to retreive interface list");
+ GST_ERROR ("Cannot open socket to retreive interface list");
return NULL;
}
@@ -246,7 +246,7 @@ farsight_get_local_ips (gboolean include_loopback)
/* Loop and get each interface the system has, one by one... */
do {
- size += sizeof(struct ifreq);
+ size += sizeof (struct ifreq);
/* realloc buffer size until no overflow occurs */
if (NULL == (ifc.ifc_req = realloc (ifc.ifc_req, size))) {
GST_ERROR ("Out of memory while allocation interface configuration"
@@ -276,13 +276,13 @@ farsight_get_local_ips (gboolean include_loopback)
continue; /* failed to get flags, skip it */
}
sa = (struct sockaddr_in *) &ifr->ifr_addr;
- GST_DEBUG("Interface: %s", ifr->ifr_name);
- GST_DEBUG("IP Address: %s", inet_ntoa(sa->sin_addr));
+ GST_DEBUG ("Interface: %s", ifr->ifr_name);
+ GST_DEBUG ("IP Address: %s", inet_ntoa (sa->sin_addr));
if ((ifr->ifr_flags & IFF_LOOPBACK) == IFF_LOOPBACK){
if (include_loopback)
loopback = g_strdup (inet_ntoa (sa->sin_addr));
else
- GST_DEBUG("Ignoring loopback interface");
+ GST_DEBUG ("Ignoring loopback interface");
} else {
if (farsight_is_private_ip (sa->sin_addr)) {
ips = g_list_append (ips, g_strdup (inet_ntoa (sa->sin_addr)));
@@ -292,7 +292,7 @@ farsight_get_local_ips (gboolean include_loopback)
}
}
- close(sockfd);
+ close (sockfd);
free (ifc.ifc_req);
if (loopback)
@@ -321,11 +321,11 @@ farsight_get_ip_for_interface (gchar *interface_name)
ifr.ifr_addr.sa_family = AF_INET;
- memset (ifr.ifr_name, 0, sizeof(ifr.ifr_name));
- strncpy (ifr.ifr_name, interface_name, sizeof(ifr.ifr_name)-1);
+ memset (ifr.ifr_name, 0, sizeof (ifr.ifr_name));
+ strncpy (ifr.ifr_name, interface_name, sizeof (ifr.ifr_name)-1);
if ((sockfd = socket (AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
- GST_ERROR("Cannot open socket to retreive interface list");
+ GST_ERROR ("Cannot open socket to retreive interface list");
return NULL;
}
@@ -339,7 +339,7 @@ farsight_get_ip_for_interface (gchar *interface_name)
close (sockfd);
sa = (struct sockaddr_in *) &ifr.ifr_addr;
GST_DEBUG ("Address for %s: %s", interface_name, inet_ntoa (sa->sin_addr));
- return g_strdup (inet_ntoa(sa->sin_addr));
+ return g_strdup (inet_ntoa (sa->sin_addr));
}
#else /* G_OS_UNIX */
@@ -356,7 +356,7 @@ static gboolean started_wsa_engine = FALSE;
* private function that initializes the WinSock engine and
* returns a prebuilt socket
**/
-SOCKET farsight_get_WSA_socket() {
+SOCKET farsight_get_WSA_socket () {
WORD wVersionRequested;
WSADATA wsaData;
@@ -364,19 +364,19 @@ SOCKET farsight_get_WSA_socket() {
SOCKET sock;
if (started_wsa_engine == FALSE) {
- wVersionRequested = MAKEWORD( 2, 0 );
+ wVersionRequested = MAKEWORD ( 2, 0 );
- err = WSAStartup( wVersionRequested, &wsaData );
+ err = WSAStartup ( wVersionRequested, &wsaData );
if ( err != 0 ) {
- GST_ERROR("Could not start the winsocket engine");
+ GST_ERROR ("Could not start the winsocket engine");
return INVALID_SOCKET;
}
started_wsa_engine = TRUE;
}
- if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET) {
- GST_ERROR("Could not open socket to retreive interface list, error no : %d", WSAGetLastError());
+ if ((sock = socket (AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET) {
+ GST_ERROR ("Could not open socket to retreive interface list, error no : %d", WSAGetLastError ());
return INVALID_SOCKET;
}
@@ -386,7 +386,7 @@ SOCKET farsight_get_WSA_socket() {
/**
* Returns the list of local interfaces
**/
-GList * farsight_get_local_interfaces()
+GList * farsight_get_local_interfaces ()
{
return NULL;
}
@@ -395,7 +395,7 @@ GList * farsight_get_local_interfaces()
/**
* Returns the list of local ips
**/
-GList * farsight_get_local_ips()
+GList * farsight_get_local_ips ()
{
return NULL;
}
@@ -403,7 +403,7 @@ GList * farsight_get_local_ips()
/**
* retreives the IP Address of an interface by its name
**/
-gchar * farsight_get_ip_for_interface(gchar *interface_name)
+gchar * farsight_get_ip_for_interface (gchar *interface_name)
{
return NULL;
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 8df1eeb..109b505 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -1033,7 +1033,7 @@ fs_rawudp_stream_transmitter_start_stun (FsRawUdpStreamTransmitter *self,
self->priv->stun_ip, gai_strerror (retval));
return FALSE;
}
- memcpy (&address, result->ai_addr, sizeof(struct sockaddr_in));
+ memcpy (&address, result->ai_addr, sizeof (struct sockaddr_in));
freeaddrinfo (result);
address.sin_family = AF_INET;
@@ -1058,7 +1058,7 @@ fs_rawudp_stream_transmitter_start_stun (FsRawUdpStreamTransmitter *self,
length = stun_message_pack (msg, &packed);
if (!fs_rawudp_transmitter_udpport_sendto (self->priv->udpports[component_id],
- packed, length, (const struct sockaddr *)&address, sizeof(address),
+ packed, length, (const struct sockaddr *)&address, sizeof (address),
error))
ret = FALSE;
@@ -1166,7 +1166,7 @@ fs_rawudp_stream_transmitter_emit_local_candidates (
for (current = g_list_first (ips);
current;
- current = g_list_next(current))
+ current = g_list_next (current))
{
FsCandidate *candidate = g_new0 (FsCandidate, 1);
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.h b/transmitters/rawudp/fs-rawudp-stream-transmitter.h
index 35b43d7..8482cba 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.h
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RAWUDP_STREAM_TRANSMITTER \
- (fs_rawudp_stream_transmitter_get_type())
+ (fs_rawudp_stream_transmitter_get_type ())
#define FS_RAWUDP_STREAM_TRANSMITTER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RAWUDP_STREAM_TRANSMITTER, \
FsRawUdpStreamTransmitter))
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index 6cb2625..0825f6a 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -545,7 +545,7 @@ _bind_port (
"Invalid IP address %s passed: %s", ip, gai_strerror (retval));
return -1;
}
- memcpy (&address, result->ai_addr, sizeof(struct sockaddr_in));
+ memcpy (&address, result->ai_addr, sizeof (struct sockaddr_in));
freeaddrinfo (result);
}
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.h b/transmitters/rawudp/fs-rawudp-transmitter.h
index 1189735..20f9daa 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.h
+++ b/transmitters/rawudp/fs-rawudp-transmitter.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_RAWUDP_TRANSMITTER \
- (fs_rawudp_transmitter_get_type())
+ (fs_rawudp_transmitter_get_type ())
#define FS_RAWUDP_TRANSMITTER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_RAWUDP_TRANSMITTER, \
FsRawUdpTransmitter))
--
1.5.6.5
More information about the farsight-commits
mailing list