luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 09:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix global variable name hidden by local variables in gio/gfileinfo.c

Browse Source
This commit is contained in:
Loic Le Page 2022-01-19 14:48:43 +01:00 committed by Philip Withnall
parent cbdddf82c0
commit 397ccd833b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/gfileinfo.c
View File

@ -99,7 +99,7 @@ G_LOCK_DEFINE_STATIC (attribute_hash);
static int namespace_id_counter = 0; static int namespace_id_counter = 0;
static GHashTable *ns_hash = NULL; static GHashTable *ns_hash = NULL;
static GHashTable *attribute_hash = NULL; static GHashTable *attribute_hash = NULL;
static char ***attributes = NULL; static char ***global_attributes = NULL;
/* Attribute ids are 32bit, we split it up like this: /* Attribute ids are 32bit, we split it up like this:
* |------------|--------------------| * |------------|--------------------|
@ -134,9 +134,9 @@ _lookup_namespace (const char *namespace)
ns_info = g_new0 (NSInfo, 1); ns_info = g_new0 (NSInfo, 1);
ns_info->id = ++namespace_id_counter; ns_info->id = ++namespace_id_counter;
g_hash_table_insert (ns_hash, g_strdup (namespace), ns_info); g_hash_table_insert (ns_hash, g_strdup (namespace), ns_info);
attributes = g_realloc (attributes, (ns_info->id + 1) * sizeof (char **)); global_attributes = g_realloc (global_attributes, (ns_info->id + 1) * sizeof (char **));
attributes[ns_info->id] = g_new (char *, 1); global_attributes[ns_info->id] = g_new (char *, 1);
attributes[ns_info->id][0] = g_strconcat (namespace, "::*", NULL); global_attributes[ns_info->id][0] = g_strconcat (namespace, "::*", NULL);
} }
return ns_info; return ns_info;
} }
@ -164,12 +164,12 @@ _lookup_attribute (const char *attribute)
g_free (ns); g_free (ns);
id = ++ns_info->attribute_id_counter; id = ++ns_info->attribute_id_counter;
attributes[ns_info->id] = g_realloc (attributes[ns_info->id], (id + 1) * sizeof (char *)); global_attributes[ns_info->id] = g_realloc (global_attributes[ns_info->id], (id + 1) * sizeof (char *));
attributes[ns_info->id][id] = g_strdup (attribute); global_attributes[ns_info->id][id] = g_strdup (attribute);
attr_id = MAKE_ATTR_ID (ns_info->id, id); attr_id = MAKE_ATTR_ID (ns_info->id, id);
g_hash_table_insert (attribute_hash, attributes[ns_info->id][id], GUINT_TO_POINTER (attr_id)); g_hash_table_insert (attribute_hash, global_attributes[ns_info->id][id], GUINT_TO_POINTER (attr_id));
return attr_id; return attr_id;
} }
@ -299,7 +299,7 @@ get_attribute_for_id (int attribute)
{ {
char *s; char *s;
G_LOCK (attribute_hash); G_LOCK (attribute_hash);
s = attributes[GET_NS(attribute)][GET_ID(attribute)]; s = global_attributes[GET_NS (attribute)][GET_ID (attribute)];
G_UNLOCK (attribute_hash); G_UNLOCK (attribute_hash);
return s; return s;
} }