Skip to content
Snippets Groups Projects
Commit 86e75e5c authored by Reynaldo H. Verdejo Pinochet's avatar Reynaldo H. Verdejo Pinochet
Browse files

dvb/parsechannels: collapse notes on channel_name encoding conflict

parent 6e0eb266
No related branches found
No related tags found
No related merge requests found
...@@ -351,6 +351,7 @@ gst_dvb_base_bin_conf_set_modulation (GstElement * dvbbasebin, ...@@ -351,6 +351,7 @@ gst_dvb_base_bin_conf_set_modulation (GstElement * dvbbasebin,
property, kf, channel_name, key, modulations, 6); property, kf, channel_name, key, modulations, 6);
} }
/* FIXME: is channel_name guaranteed to be ASCII or UTF-8? */
static gboolean static gboolean
parse_and_configure_from_v5_conf_file (GstElement * dvbbasebin, parse_and_configure_from_v5_conf_file (GstElement * dvbbasebin,
const gchar * filename, const gchar * channel_name, GError ** error) const gchar * filename, const gchar * channel_name, GError ** error)
...@@ -416,7 +417,6 @@ load_error: ...@@ -416,7 +417,6 @@ load_error:
unknown_channel: unknown_channel:
{ {
/* FIXME: is channel name guaranteed to be ASCII or UTF-8? */
g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_FOUND, g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_FOUND,
_("Couldn't find details for channel '%s'"), channel_name); _("Couldn't find details for channel '%s'"), channel_name);
g_key_file_unref (keyfile); g_key_file_unref (keyfile);
...@@ -426,7 +426,6 @@ unknown_channel: ...@@ -426,7 +426,6 @@ unknown_channel:
no_properties: no_properties:
{ {
/* FIXME: is channel name guaranteed to be ASCII or UTF-8? */
g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_FOUND, g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_FOUND,
_("No properties for channel '%s'"), channel_name); _("No properties for channel '%s'"), channel_name);
g_key_file_unref (keyfile); g_key_file_unref (keyfile);
...@@ -436,7 +435,6 @@ no_properties: ...@@ -436,7 +435,6 @@ no_properties:
property_error: property_error:
{ {
/* FIXME: is channel name guaranteed to be ASCII or UTF-8? */
g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_FAILED, g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_FAILED,
_("Failed to set properties for channel '%s'"), channel_name); _("Failed to set properties for channel '%s'"), channel_name);
g_key_file_unref (keyfile); g_key_file_unref (keyfile);
...@@ -589,6 +587,7 @@ destroy_channels_hash (GHashTable * channels) ...@@ -589,6 +587,7 @@ destroy_channels_hash (GHashTable * channels)
g_hash_table_foreach_remove (channels, remove_channel_from_hash, NULL); g_hash_table_foreach_remove (channels, remove_channel_from_hash, NULL);
} }
/* FIXME: is channel_name guaranteed to be ASCII or UTF-8? */
static gboolean static gboolean
parse_and_configure_from_zap_conf_file (GstElement * dvbbasebin, parse_and_configure_from_zap_conf_file (GstElement * dvbbasebin,
const gchar * filename, const gchar * channel_name, GError ** error) const gchar * filename, const gchar * channel_name, GError ** error)
...@@ -843,7 +842,6 @@ beach: ...@@ -843,7 +842,6 @@ beach:
unknown_channel: unknown_channel:
{ {
/* FIXME: is channel name guaranteed to be ASCII or UTF-8? */
g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_FOUND, g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_FOUND,
_("Couldn't find details for channel '%s'"), channel_name); _("Couldn't find details for channel '%s'"), channel_name);
destroy_channels_hash (channels); destroy_channels_hash (channels);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment