[farsight2/master] Improve coding style (func() -> func ())
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:21:49 PST 2008
---
gst-libs/gst/farsight/fs-base-conference.h | 4 ++--
gst-libs/gst/farsight/fs-candidate.c | 7 +++----
gst-libs/gst/farsight/fs-candidate.h | 4 ++--
gst-libs/gst/farsight/fs-codec.c | 8 ++++----
gst-libs/gst/farsight/fs-codec.h | 4 ++--
gst-libs/gst/farsight/fs-element-added-notifier.c | 12 ++++++------
gst-libs/gst/farsight/fs-element-added-notifier.h | 2 +-
gst-libs/gst/farsight/fs-participant.h | 2 +-
gst-libs/gst/farsight/fs-plugin.c | 10 +++++-----
gst-libs/gst/farsight/fs-plugin.h | 2 +-
gst-libs/gst/farsight/fs-session.h | 2 +-
gst-libs/gst/farsight/fs-stream-transmitter.h | 2 +-
gst-libs/gst/farsight/fs-stream.h | 2 +-
gst-libs/gst/farsight/fs-transmitter.c | 2 +-
gst-libs/gst/farsight/fs-transmitter.h | 2 +-
15 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/gst-libs/gst/farsight/fs-base-conference.h b/gst-libs/gst/farsight/fs-base-conference.h
index 2fcc720..dafada0 100644
--- a/gst-libs/gst/farsight/fs-base-conference.h
+++ b/gst-libs/gst/farsight/fs-base-conference.h
@@ -35,7 +35,7 @@
G_BEGIN_DECLS
#define FS_TYPE_BASE_CONFERENCE \
- (fs_base_conference_get_type())
+ (fs_base_conference_get_type ())
#define FS_BASE_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),FS_TYPE_BASE_CONFERENCE,FsBaseConference))
#define FS_BASE_CONFERENCE_CLASS(klass) \
@@ -100,7 +100,7 @@ struct _FsBaseConferenceClass
gpointer _padding[8];
};
-GType fs_base_conference_get_type(void);
+GType fs_base_conference_get_type (void);
G_END_DECLS
diff --git a/gst-libs/gst/farsight/fs-candidate.c b/gst-libs/gst/farsight/fs-candidate.c
index ea73789..42719ce 100644
--- a/gst-libs/gst/farsight/fs-candidate.c
+++ b/gst-libs/gst/farsight/fs-candidate.c
@@ -129,7 +129,7 @@ fs_candidate_list_destroy (GList *candidate_list)
for (lp = candidate_list; lp; lp = g_list_next (lp)) {
cand = (FsCandidate *) lp->data;
- fs_candidate_destroy(cand);
+ fs_candidate_destroy (cand);
lp->data = NULL;
}
g_list_free (candidate_list);
@@ -178,10 +178,9 @@ fs_candidate_get_by_id (const GList *candidate_list,
for (lp = candidate_list; lp; lp = g_list_next (lp)) {
cand = (FsCandidate *) lp->data;
- if (g_ascii_strcasecmp(cand->candidate_id, candidate_id) == 0)
+ if (g_ascii_strcasecmp (cand->candidate_id, candidate_id) == 0)
{
cand_copy = fs_candidate_copy (cand);
- g_print("%p\n", cand_copy);
break;
}
}
@@ -203,7 +202,7 @@ fs_candidate_are_equal (const FsCandidate *cand1,
{
/* TODO we compare just the ip and port for now
* is this enough ? think about it some more */
- if ((g_ascii_strcasecmp(cand1->ip, cand2->ip) == 0) &&
+ if ((g_ascii_strcasecmp (cand1->ip, cand2->ip) == 0) &&
(cand1->port == cand2->port))
return TRUE;
else
diff --git a/gst-libs/gst/farsight/fs-candidate.h b/gst-libs/gst/farsight/fs-candidate.h
index ce14171..1a81fcc 100644
--- a/gst-libs/gst/farsight/fs-candidate.h
+++ b/gst-libs/gst/farsight/fs-candidate.h
@@ -31,11 +31,11 @@
G_BEGIN_DECLS
#define FS_TYPE_CANDIDATE \
- (fs_candidate_get_type())
+ (fs_candidate_get_type ())
#define FS_TYPE_CANDIDATE_LIST \
- (fs_candidate_list_get_type())
+ (fs_candidate_list_get_type ())
/**
* FsCandidateType:
diff --git a/gst-libs/gst/farsight/fs-codec.c b/gst-libs/gst/farsight/fs-codec.c
index a822dd2..e51e7c3 100644
--- a/gst-libs/gst/farsight/fs-codec.c
+++ b/gst-libs/gst/farsight/fs-codec.c
@@ -182,7 +182,7 @@ fs_codec_list_destroy (GList *codec_list)
for (lp = codec_list; lp; lp = g_list_next (lp)) {
codec = (FsCodec *) lp->data;
- fs_codec_destroy(codec);
+ fs_codec_destroy (codec);
lp->data = NULL;
}
g_list_free (codec_list);
@@ -293,10 +293,10 @@ fs_codec_list_from_keyfile (const gchar *filename, GError **error)
goto next_codec;
}
- if ((next_tok - groups[i]) == 5 /* strlen("audio") */ &&
+ if ((next_tok - groups[i]) == 5 /* strlen ("audio") */ &&
!g_ascii_strncasecmp ("audio", groups[i], 5))
codec->media_type = FS_MEDIA_TYPE_AUDIO;
- else if ((next_tok - groups[i]) == 5 /* strlen("video") */ &&
+ else if ((next_tok - groups[i]) == 5 /* strlen ("video") */ &&
!g_ascii_strncasecmp ("video", groups[i], 5))
codec->media_type = FS_MEDIA_TYPE_VIDEO;
else {
@@ -458,7 +458,7 @@ fs_codec_to_string (const FsCodec *codec)
* It compares GLists of FarsightCodecParameter
*/
static gboolean
-compare_lists(GList *list1, GList *list2)
+compare_lists (GList *list1, GList *list2)
{
GList *item1;
diff --git a/gst-libs/gst/farsight/fs-codec.h b/gst-libs/gst/farsight/fs-codec.h
index 937802b..e922e77 100644
--- a/gst-libs/gst/farsight/fs-codec.h
+++ b/gst-libs/gst/farsight/fs-codec.h
@@ -36,10 +36,10 @@ typedef struct _FsCodec FsCodec;
typedef struct _FsCodecParameter FsCodecParameter;
#define FS_TYPE_CODEC \
- (fs_codec_get_type())
+ (fs_codec_get_type ())
#define FS_TYPE_CODEC_LIST \
- (fs_codec_list_get_type())
+ (fs_codec_list_get_type ())
/**
* FsMediaType:
diff --git a/gst-libs/gst/farsight/fs-element-added-notifier.c b/gst-libs/gst/farsight/fs-element-added-notifier.c
index b619e51..2535f89 100644
--- a/gst-libs/gst/farsight/fs-element-added-notifier.c
+++ b/gst-libs/gst/farsight/fs-element-added-notifier.c
@@ -160,7 +160,7 @@ _bin_unparented_cb (GstObject *object, GstObject *parent, gpointer user_data)
gboolean done;
/* Return if there was no handler connected */
- if (g_signal_handlers_disconnect_by_func(object, _element_added_callback,
+ if (g_signal_handlers_disconnect_by_func (object, _element_added_callback,
user_data) == 0)
return;
@@ -322,7 +322,7 @@ _bin_added_from_keyfile (FsElementAddedNotifier *notifier, GstBin *bin,
#else
str_key_value = g_key_file_get_value (keyfile, name, keys[i],
NULL);
- double_key_value = g_strtod(str_key_value, NULL);
+ double_key_value = g_strtod (str_key_value, NULL);
#endif
g_value_init (&key_value, G_TYPE_DOUBLE);
g_value_set_double (&key_value, double_key_value);
@@ -333,7 +333,7 @@ _bin_added_from_keyfile (FsElementAddedNotifier *notifier, GstBin *bin,
case G_TYPE_ULONG:
str_key_value = g_key_file_get_value (keyfile, name, keys[i],
NULL);
- ulong_key_value = strtoul(str_key_value, NULL, 10);
+ ulong_key_value = strtoul (str_key_value, NULL, 10);
g_value_init (&key_value, G_TYPE_ULONG);
g_value_set_ulong (&key_value, ulong_key_value);
DEBUG ("%s is a ulong: %lu", keys[i], ulong_key_value);
@@ -341,7 +341,7 @@ _bin_added_from_keyfile (FsElementAddedNotifier *notifier, GstBin *bin,
case G_TYPE_LONG:
str_key_value = g_key_file_get_value (keyfile, name, keys[i],
NULL);
- long_key_value = strtol(str_key_value, NULL, 10);
+ long_key_value = strtol (str_key_value, NULL, 10);
g_value_init (&key_value, G_TYPE_LONG);
g_value_set_long (&key_value, long_key_value);
DEBUG ("%s is a long: %ld", keys[i], long_key_value);
@@ -368,10 +368,10 @@ _bin_added_from_keyfile (FsElementAddedNotifier *notifier, GstBin *bin,
}
DEBUG ("Setting %s to on %s", keys[i], name);
- g_object_set_property (G_OBJECT(element), keys[i], &prop_value);
+ g_object_set_property (G_OBJECT (element), keys[i], &prop_value);
}
- g_strfreev(keys);
+ g_strfreev (keys);
}
diff --git a/gst-libs/gst/farsight/fs-element-added-notifier.h b/gst-libs/gst/farsight/fs-element-added-notifier.h
index aa62895..69681d2 100644
--- a/gst-libs/gst/farsight/fs-element-added-notifier.h
+++ b/gst-libs/gst/farsight/fs-element-added-notifier.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_ELEMENT_ADDED_NOTIFIER \
- (fs_element_added_notifier_get_type())
+ (fs_element_added_notifier_get_type ())
#define FS_ELEMENT_ADDED_NOTIFIER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_ELEMENT_ADDED_NOTIFIER, \
FsElementAddedNotifier))
diff --git a/gst-libs/gst/farsight/fs-participant.h b/gst-libs/gst/farsight/fs-participant.h
index 970317f..0e30527 100644
--- a/gst-libs/gst/farsight/fs-participant.h
+++ b/gst-libs/gst/farsight/fs-participant.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_PARTICIPANT \
- (fs_participant_get_type())
+ (fs_participant_get_type ())
#define FS_PARTICIPANT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_PARTICIPANT, FsParticipant))
#define FS_PARTICIPANT_CLASS(klass) \
diff --git a/gst-libs/gst/farsight/fs-plugin.c b/gst-libs/gst/farsight/fs-plugin.c
index 916ff73..7886445 100644
--- a/gst-libs/gst/farsight/fs-plugin.c
+++ b/gst-libs/gst/farsight/fs-plugin.c
@@ -106,7 +106,7 @@ fs_plugin_class_init (FsPluginClass * klass)
gobject_class->dispose = fs_plugin_dispose;
gobject_class->finalize = fs_plugin_finalize;
- parent_class = g_type_class_peek_parent(klass);
+ parent_class = g_type_class_peek_parent (klass);
module_class->load = fs_plugin_load;
module_class->unload = fs_plugin_unload;
@@ -165,7 +165,7 @@ static gboolean fs_plugin_load (GTypeModule *module)
for (search_path = search_paths; *search_path; search_path++) {
GST_DEBUG("looking for plugins in %s", *search_path);
- path = g_module_build_path(*search_path, plugin->name);
+ path = g_module_build_path (*search_path, plugin->name);
plugin->priv->handle = g_module_open (path, G_MODULE_BIND_LOCAL);
GST_INFO ("opening module %s: %s\n", path,
@@ -240,7 +240,7 @@ fs_plugin_get_by_name (const gchar * name, const gchar * type_suffix)
for (plugin_item = plugins;
plugin_item;
- plugin_item = g_list_next(plugin_item)) {
+ plugin_item = g_list_next (plugin_item)) {
plugin = plugin_item->data;
if (plugin->name == NULL || plugin->name[0] == 0)
continue;
@@ -304,7 +304,7 @@ fs_plugin_create_valist (const gchar *name, const gchar *type_suffix,
}
plugin->name = g_strdup_printf ("%s-%s",name,type_suffix);
g_type_module_set_name (G_TYPE_MODULE (plugin), plugin->name);
- plugins = g_list_append(plugins, plugin);
+ plugins = g_list_append (plugins, plugin);
}
if (!g_type_module_use (G_TYPE_MODULE (plugin))) {
@@ -315,7 +315,7 @@ fs_plugin_create_valist (const gchar *name, const gchar *type_suffix,
object = g_object_new_valist (plugin->type, first_property_name, var_args);
- g_type_module_unuse(G_TYPE_MODULE(plugin));
+ g_type_module_unuse (G_TYPE_MODULE (plugin));
return object;
}
diff --git a/gst-libs/gst/farsight/fs-plugin.h b/gst-libs/gst/farsight/fs-plugin.h
index b8bc810..04a0207 100644
--- a/gst-libs/gst/farsight/fs-plugin.h
+++ b/gst-libs/gst/farsight/fs-plugin.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_PLUGIN \
- (fs_plugin_get_type())
+ (fs_plugin_get_type ())
#define FS_PLUGIN(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_PLUGIN, FsPlugin))
#define FS_PLUGIN_CLASS(klass) \
diff --git a/gst-libs/gst/farsight/fs-session.h b/gst-libs/gst/farsight/fs-session.h
index 71d9607..23a2a8d 100644
--- a/gst-libs/gst/farsight/fs-session.h
+++ b/gst-libs/gst/farsight/fs-session.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_SESSION \
- (fs_session_get_type())
+ (fs_session_get_type ())
#define FS_SESSION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_SESSION, FsSession))
#define FS_SESSION_CLASS(klass) \
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.h b/gst-libs/gst/farsight/fs-stream-transmitter.h
index fc8d266..c4586f3 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.h
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_STREAM_TRANSMITTER \
- (fs_stream_transmitter_get_type())
+ (fs_stream_transmitter_get_type ())
#define FS_STREAM_TRANSMITTER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_STREAM_TRANSMITTER, \
FsStreamTransmitter))
diff --git a/gst-libs/gst/farsight/fs-stream.h b/gst-libs/gst/farsight/fs-stream.h
index d9deef4..e788403 100644
--- a/gst-libs/gst/farsight/fs-stream.h
+++ b/gst-libs/gst/farsight/fs-stream.h
@@ -53,7 +53,7 @@ typedef enum
/* TYPE MACROS */
#define FS_TYPE_STREAM \
- (fs_stream_get_type())
+ (fs_stream_get_type ())
#define FS_STREAM(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_STREAM, FsStream))
#define FS_STREAM_CLASS(klass) \
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index 9858e5d..e4d38b7 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -284,7 +284,7 @@ fs_transmitter_new (const gchar *type, guint components, GError **error)
g_return_val_if_fail (type != NULL, NULL);
- self = FS_TRANSMITTER(fs_plugin_create(type, "transmitter", error,
+ self = FS_TRANSMITTER (fs_plugin_create (type, "transmitter", error,
"components", components, NULL));
if (!self)
diff --git a/gst-libs/gst/farsight/fs-transmitter.h b/gst-libs/gst/farsight/fs-transmitter.h
index 3f47a48..c410689 100644
--- a/gst-libs/gst/farsight/fs-transmitter.h
+++ b/gst-libs/gst/farsight/fs-transmitter.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
/* TYPE MACROS */
#define FS_TYPE_TRANSMITTER \
- (fs_transmitter_get_type())
+ (fs_transmitter_get_type ())
#define FS_TRANSMITTER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), FS_TYPE_TRANSMITTER, FsTransmitter))
#define FS_TRANSMITTER_CLASS(klass) \
--
1.5.6.5
More information about the farsight-commits
mailing list