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

gfileinfo: Split out a g_file_info_remove_value() helper function

Browse Source 
This introduces no functional changes but will make refactoring a bit
easier in the following commit.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-05-27 16:55:18 +01:00
parent a922f2f2c7
commit 7ad6b05458
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gio/gfileinfo.c
View File

@ -688,6 +688,28 @@ g_file_info_get_attribute_type (GFileInfo *info,
return G_FILE_ATTRIBUTE_TYPE_INVALID; return G_FILE_ATTRIBUTE_TYPE_INVALID;
} }
static void
g_file_info_remove_value (GFileInfo *info,
guint32 attr_id)
{
GFileAttribute *attrs;
guint i;
if (info->mask != NO_ATTRIBUTE_MASK &&
!_g_file_attribute_matcher_matches_id (info->mask, attr_id))
return;
i = g_file_info_find_place (info, attr_id);
attrs = (GFileAttribute *)info->attributes->data;
if (i < info->attributes->len &&
attrs[i].attribute == attr_id)
{
_g_file_attribute_value_clear (&attrs[i].value);
g_array_remove_index (info->attributes, i);
}
}
/** /**
* g_file_info_remove_attribute: * g_file_info_remove_attribute:
* @info: a #GFileInfo. * @info: a #GFileInfo.
@ -700,22 +722,13 @@ g_file_info_remove_attribute (GFileInfo *info,
const char *attribute) const char *attribute)
{ {
guint32 attr_id; guint32 attr_id;
GFileAttribute *attrs;
guint i;
g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (G_IS_FILE_INFO (info));
g_return_if_fail (attribute != NULL && *attribute != '\0'); g_return_if_fail (attribute != NULL && *attribute != '\0');
attr_id = lookup_attribute (attribute); attr_id = lookup_attribute (attribute);
i = g_file_info_find_place (info, attr_id); g_file_info_remove_value (info, attr_id);
attrs = (GFileAttribute *)info->attributes->data;
if (i < info->attributes->len &&
attrs[i].attribute == attr_id)
{
_g_file_attribute_value_clear (&attrs[i].value);
g_array_remove_index (info->attributes, i);
}
} }
/** /**