diff options
author | Parthasarathi Susarla <partha.susarla@collabora.co.uk> | 2011-02-11 23:20:10 +1100 |
---|---|---|
committer | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2011-02-15 15:15:44 +0200 |
commit | 497466586f77755ba442f5cea9c5b83a44621837 (patch) | |
tree | 621a2ad74a3fcb9c035a3d9e3c082180ebad738f | |
parent | b66813feef500ab94b43677181c40d421f54a3f2 (diff) | |
download | gupnp-dlna-497466586f77755ba442f5cea9c5b83a44621837.tar.gz |
Remove misleading 'Priv' suffix
Remove the misleading 'Priv' suffix from GUPnPDLNARestrictionsPriv. This
internal structure is now known as 'GUPnPDLNARestrictions'.
-rw-r--r-- | libgupnp-dlna/gupnp-dlna-load.c | 34 | ||||
-rw-r--r-- | libgupnp-dlna/gupnp-dlna-load.h | 2 | ||||
-rw-r--r-- | tests/dlna-profile-parser.c | 10 |
3 files changed, 23 insertions, 23 deletions
diff --git a/libgupnp-dlna/gupnp-dlna-load.c b/libgupnp-dlna/gupnp-dlna-load.c index 3d7f68e..527bf57 100644 --- a/libgupnp-dlna/gupnp-dlna-load.c +++ b/libgupnp-dlna/gupnp-dlna-load.c @@ -157,12 +157,12 @@ xml_str_free (xmlChar *str, gpointer unused) static void free_restrictions_struct (gpointer data, gpointer user_data) { - GUPnPDLNARestrictionsPriv *priv = (GUPnPDLNARestrictionsPriv *)data; - if (priv) { - if (priv->caps) - gst_caps_unref (priv->caps); + GUPnPDLNARestrictions *restr = (GUPnPDLNARestrictions *)data; + if (restr) { + if (restr->caps) + gst_caps_unref (restr->caps); - g_free (priv); + g_free (restr); } } @@ -303,12 +303,12 @@ process_field (xmlTextReaderPtr reader, return ret; } -static GUPnPDLNARestrictionsPriv * +static GUPnPDLNARestrictions * process_parent (xmlTextReaderPtr reader, GUPnPDLNALoadState *data) { xmlChar *parent; xmlChar *used; - GUPnPDLNARestrictionsPriv *priv = NULL; + GUPnPDLNARestrictions *restr = NULL; /* * Check to see if we need to follow any relaxed/strict mode @@ -328,9 +328,9 @@ process_parent (xmlTextReaderPtr reader, GUPnPDLNALoadState *data) } parent = xmlTextReaderGetAttribute (reader, BAD_CAST ("name")); - priv = g_hash_table_lookup (data->restrictions, parent); + restr = g_hash_table_lookup (data->restrictions, parent); - if (!priv) { + if (!restr) { g_warning ("Could not find parent restriction: %s", parent); return NULL; } @@ -338,13 +338,13 @@ process_parent (xmlTextReaderPtr reader, GUPnPDLNALoadState *data) xmlFree (parent); xmlFree (used); - return priv; + return restr; } -static GUPnPDLNARestrictionsPriv * +static GUPnPDLNARestrictions * process_restriction (xmlTextReaderPtr reader, GUPnPDLNALoadState *data) { - GUPnPDLNARestrictionsPriv *restr = NULL; + GUPnPDLNARestrictions *restr = NULL; GType type; GstCaps *caps = NULL; GString *caps_str = g_string_sized_new (100); @@ -406,15 +406,15 @@ process_restriction (xmlTextReaderPtr reader, GUPnPDLNALoadState *data) xmlFree (field); } else if (xmlStrEqual (tag, BAD_CAST ("parent"))) { /* <parent> */ - GUPnPDLNARestrictionsPriv *priv = + GUPnPDLNARestrictions *restr = process_parent (reader, data); - if (priv && priv->caps) + if (restr && restr->caps) /* Collect parents in a list - we'll * coalesce them later */ parents = g_list_append (parents, gst_caps_copy - (priv->caps)); + (restr->caps)); } break; @@ -471,7 +471,7 @@ process_restriction (xmlTextReaderPtr reader, GUPnPDLNALoadState *data) tmp = tmp->next; } - restr = g_new0 (GUPnPDLNARestrictionsPriv, 1); + restr = g_new0 (GUPnPDLNARestrictions, 1); restr->caps = gst_caps_copy (caps); restr->type = type; @@ -534,7 +534,7 @@ process_dlna_profile (xmlTextReaderPtr reader, guint ret; GUPnPDLNAProfile *profile = NULL; GUPnPDLNAProfile *base = NULL; - GUPnPDLNARestrictionsPriv *restr = NULL; + GUPnPDLNARestrictions *restr = NULL; GstCaps *temp_audio = NULL, *temp_video = NULL, *temp_container = NULL; xmlChar *name, *mime, *id, *base_profile, *extended; gboolean done = FALSE, is_extended = FALSE; diff --git a/libgupnp-dlna/gupnp-dlna-load.h b/libgupnp-dlna/gupnp-dlna-load.h index e6e04ef..fa1f966 100644 --- a/libgupnp-dlna/gupnp-dlna-load.h +++ b/libgupnp-dlna/gupnp-dlna-load.h @@ -38,7 +38,7 @@ typedef struct { typedef struct { GstCaps *caps; GType type; -} GUPnPDLNARestrictionsPriv; +} GUPnPDLNARestrictions; GList * gupnp_dlna_load_profiles_from_file (const gchar *file_name, diff --git a/tests/dlna-profile-parser.c b/tests/dlna-profile-parser.c index 4c73da3..1482b1b 100644 --- a/tests/dlna-profile-parser.c +++ b/tests/dlna-profile-parser.c @@ -74,12 +74,12 @@ static void print_profile (GUPnPDLNAProfile *profile, gpointer unused) static void free_restrictions_struct (gpointer data, gpointer user_data) { - GUPnPDLNARestrictionsPriv *priv = (GUPnPDLNARestrictionsPriv *)data; - if (priv) { - if (priv->caps) - gst_caps_unref (priv->caps); + GUPnPDLNARestrictions *restr = (GUPnPDLNARestrictions *)data; + if (restr) { + if (restr->caps) + gst_caps_unref (restr->caps); - g_free (priv); + g_free (restr); } } |