[gssdp] Indentation and code style fixes
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gssdp] Indentation and code style fixes
- Date: Sat, 16 Jul 2011 12:09:11 +0000 (UTC)
commit b048a293781755f2839c185087263f983ccd66d0
Author: Jens Georg <mail jensge org>
Date: Sun Jun 26 09:06:51 2011 +0200
Indentation and code style fixes
libgssdp/gssdp-client.c | 14 +++++++-------
libgssdp/gssdp-resource-browser.c | 36 ++++++++++++++++++------------------
libgssdp/gssdp-resource-group.c | 32 ++++++++++++++++++--------------
3 files changed, 43 insertions(+), 39 deletions(-)
---
diff --git a/libgssdp/gssdp-client.c b/libgssdp/gssdp-client.c
index ba52027..3b0c900 100644
--- a/libgssdp/gssdp-client.c
+++ b/libgssdp/gssdp-client.c
@@ -403,12 +403,12 @@ gssdp_client_class_init (GSSDPClientClass *klass)
{
GObjectClass *object_class;
- object_class = G_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- object_class->set_property = gssdp_client_set_property;
- object_class->get_property = gssdp_client_get_property;
- object_class->dispose = gssdp_client_dispose;
- object_class->finalize = gssdp_client_finalize;
+ object_class->set_property = gssdp_client_set_property;
+ object_class->get_property = gssdp_client_get_property;
+ object_class->dispose = gssdp_client_dispose;
+ object_class->finalize = gssdp_client_finalize;
g_type_class_add_private (klass, sizeof (GSSDPClientPrivate));
@@ -1250,8 +1250,8 @@ get_host_ip (char **iface, char **network)
continue;
else if (!(ifa->ifa_flags & IFF_UP))
continue;
- else if ((ifa->ifa_flags & IFF_POINTOPOINT))
- continue;
+ else if ((ifa->ifa_flags & IFF_POINTOPOINT))
+ continue;
/* Loopback and IPv6 interfaces go at the bottom on the list */
if (ifa->ifa_flags & IFF_LOOPBACK ||
diff --git a/libgssdp/gssdp-resource-browser.c b/libgssdp/gssdp-resource-browser.c
index c033ee1..eb081d5 100644
--- a/libgssdp/gssdp-resource-browser.c
+++ b/libgssdp/gssdp-resource-browser.c
@@ -247,12 +247,12 @@ gssdp_resource_browser_class_init (GSSDPResourceBrowserClass *klass)
{
GObjectClass *object_class;
- object_class = G_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- object_class->set_property = gssdp_resource_browser_set_property;
- object_class->get_property = gssdp_resource_browser_get_property;
- object_class->dispose = gssdp_resource_browser_dispose;
- object_class->finalize = gssdp_resource_browser_finalize;
+ object_class->set_property = gssdp_resource_browser_set_property;
+ object_class->get_property = gssdp_resource_browser_get_property;
+ object_class->dispose = gssdp_resource_browser_dispose;
+ object_class->finalize = gssdp_resource_browser_finalize;
g_type_class_add_private (klass, sizeof (GSSDPResourceBrowserPrivate));
@@ -705,13 +705,13 @@ resource_available (GSSDPResourceBrowser *resource_browser,
}
resource->timeout_src = g_timeout_source_new_seconds (timeout);
- g_source_set_callback (resource->timeout_src,
+ g_source_set_callback (resource->timeout_src,
resource_expire,
- resource, NULL);
+ resource, NULL);
context = gssdp_client_get_main_context
(resource_browser->priv->client);
- g_source_attach (resource->timeout_src, context);
+ g_source_attach (resource->timeout_src, context);
g_source_unref (resource->timeout_src);
@@ -950,7 +950,7 @@ discovery_timeout (gpointer data)
resource_browser->priv->num_discovery += 1;
if (resource_browser->priv->num_discovery >= MAX_DISCOVERY_MESSAGES) {
- resource_browser->priv->timeout_src = NULL;
+ resource_browser->priv->timeout_src = NULL;
resource_browser->priv->num_discovery = 0;
return FALSE;
@@ -971,13 +971,13 @@ start_discovery (GSSDPResourceBrowser *resource_browser)
resource_browser->priv->num_discovery = 1;
resource_browser->priv->timeout_src =
g_timeout_source_new (DISCOVERY_FREQUENCY);
- g_source_set_callback (resource_browser->priv->timeout_src,
- discovery_timeout,
- resource_browser, NULL);
+ g_source_set_callback (resource_browser->priv->timeout_src,
+ discovery_timeout,
+ resource_browser, NULL);
context = gssdp_client_get_main_context
(resource_browser->priv->client);
- g_source_attach (resource_browser->priv->timeout_src, context);
+ g_source_attach (resource_browser->priv->timeout_src, context);
g_source_unref (resource_browser->priv->timeout_src);
}
@@ -986,9 +986,9 @@ start_discovery (GSSDPResourceBrowser *resource_browser)
static void
stop_discovery (GSSDPResourceBrowser *resource_browser)
{
- if (resource_browser->priv->timeout_src) {
- g_source_destroy (resource_browser->priv->timeout_src);
- resource_browser->priv->timeout_src = NULL;
- resource_browser->priv->num_discovery = 0;
- }
+ if (resource_browser->priv->timeout_src) {
+ g_source_destroy (resource_browser->priv->timeout_src);
+ resource_browser->priv->timeout_src = NULL;
+ resource_browser->priv->num_discovery = 0;
+ }
}
diff --git a/libgssdp/gssdp-resource-group.c b/libgssdp/gssdp-resource-group.c
index f9be029..224be63 100644
--- a/libgssdp/gssdp-resource-group.c
+++ b/libgssdp/gssdp-resource-group.c
@@ -281,11 +281,11 @@ gssdp_resource_group_class_init (GSSDPResourceGroupClass *klass)
{
GObjectClass *object_class;
- object_class = G_OBJECT_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
- object_class->set_property = gssdp_resource_group_set_property;
- object_class->get_property = gssdp_resource_group_get_property;
- object_class->dispose = gssdp_resource_group_dispose;
+ object_class->set_property = gssdp_resource_group_set_property;
+ object_class->get_property = gssdp_resource_group_get_property;
+ object_class->dispose = gssdp_resource_group_dispose;
g_type_class_add_private (klass, sizeof (GSSDPResourceGroupPrivate));
@@ -538,13 +538,13 @@ gssdp_resource_group_set_available (GSSDPResourceGroup *resource_group,
/* Add re-announcement timer */
resource_group->priv->timeout_src =
g_timeout_source_new_seconds (timeout);
- g_source_set_callback (resource_group->priv->timeout_src,
- resource_group_timeout,
- resource_group, NULL);
+ g_source_set_callback (resource_group->priv->timeout_src,
+ resource_group_timeout,
+ resource_group, NULL);
context = gssdp_client_get_main_context
(resource_group->priv->client);
- g_source_attach (resource_group->priv->timeout_src, context);
+ g_source_attach (resource_group->priv->timeout_src, context);
g_source_unref (resource_group->priv->timeout_src);
@@ -824,12 +824,12 @@ message_received_cb (GSSDPClient *client,
/* Add timeout */
response->timeout_src = g_timeout_source_new (timeout);
- g_source_set_callback (response->timeout_src,
- discovery_response_timeout,
- response, NULL);
+ g_source_set_callback (response->timeout_src,
+ discovery_response_timeout,
+ response, NULL);
context = gssdp_client_get_main_context (client);
- g_source_attach (response->timeout_src, context);
+ g_source_attach (response->timeout_src, context);
g_source_unref (response->timeout_src);
@@ -866,7 +866,9 @@ construct_al (Resource *resource)
}
static char *
-construct_usn (const char *usn, const char *response_target, const char *resource_target)
+construct_usn (const char *usn,
+ const char *response_target,
+ const char *resource_target)
{
const char *needle;
char *prefix;
@@ -905,7 +907,9 @@ discovery_response_timeout (gpointer user_data)
max_age = response->resource->resource_group->priv->max_age;
al = construct_al (response->resource);
- usn = construct_usn (response->resource->usn, response->target, response->resource->target);
+ usn = construct_usn (response->resource->usn,
+ response->target,
+ response->resource->target);
date = soup_date_new_from_now (0);
date_str = soup_date_to_string (date, SOUP_DATE_HTTP);
soup_date_free (date);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]