summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2021-03-10 12:50:19 +0100
committerraveit65 <[email protected]>2021-03-29 08:30:33 +0200
commit8c4d1a8f38aa0cbf9bed07dd0631f223e1ada0fd (patch)
tree521157543327123865b8909955364b8c0486f7d5
parenta1c494f176ff7a376fe069a238b7a06b835d3584 (diff)
downloadpluma-8c4d1a8f38aa0cbf9bed07dd0631f223e1ada0fd.tar.bz2
pluma-8c4d1a8f38aa0cbf9bed07dd0631f223e1ada0fd.tar.xz
warning: declaration of ‘taglist’ shadows a global declaration
-rw-r--r--plugins/taglist/pluma-taglist-plugin-parser.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/plugins/taglist/pluma-taglist-plugin-parser.c b/plugins/taglist/pluma-taglist-plugin-parser.c
index 10e9e9ca..b743c14b 100644
--- a/plugins/taglist/pluma-taglist-plugin-parser.c
+++ b/plugins/taglist/pluma-taglist-plugin-parser.c
@@ -287,8 +287,11 @@ groups_cmp (gconstpointer a, gconstpointer b)
* Therefore need to pick up the best lang on the current locale.
*/
static TagList*
-lookup_best_lang (TagList *taglist, const gchar *filename,
- xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
+lookup_best_lang (TagList *tag_list,
+ const gchar *filename,
+ xmlDocPtr doc,
+ xmlNsPtr ns,
+ xmlNodePtr cur)
{
TagGroup *best_tag_group = NULL;
@@ -310,7 +313,7 @@ lookup_best_lang (TagList *taglist, const gchar *filename,
"was '%s', 'TagGroup' expected.", filename, cur->name);
xmlFreeDoc (doc);
- return taglist;
+ return tag_list;
}
else
{
@@ -326,13 +329,13 @@ lookup_best_lang (TagList *taglist, const gchar *filename,
/*
* When found a new TagGroup, prepend the best
- * tag_group to taglist. In the current intltool-merge,
+ * tag_group to tag_list. In the current intltool-merge,
* the first section is the default lang NULL.
*/
if (lang == NULL) {
if (best_tag_group != NULL) {
- taglist->tag_groups =
- g_list_prepend (taglist->tag_groups, best_tag_group);
+ tag_list->tag_groups =
+ g_list_prepend (tag_list->tag_groups, best_tag_group);
}
best_tag_group = NULL;
@@ -405,13 +408,13 @@ lookup_best_lang (TagList *taglist, const gchar *filename,
/* Prepend TagGroup to TagList */
if (best_tag_group != NULL) {
- taglist->tag_groups =
- g_list_prepend (taglist->tag_groups, best_tag_group);
+ tag_list->tag_groups =
+ g_list_prepend (tag_list->tag_groups, best_tag_group);
}
- taglist->tag_groups = g_list_sort (taglist->tag_groups, groups_cmp);
+ tag_list->tag_groups = g_list_sort (tag_list->tag_groups, groups_cmp);
- return taglist;
+ return tag_list;
}
static TagList *