mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-07 07:25:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

common: Don't shadow parameter variables

Browse Source
This commit is contained in:
Matthew Leeds
2020-03-11 17:11:34 -07:00
committed by Alexander Larsson
parent 2f49385379
commit 6aa3ff0d6f
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/flatpak-installation.c
View File

@@ -3006,13 +3006,13 @@ flatpak_installation_list_remote_related_refs_sync (FlatpakInstallation *self,
for (i = 0; i < related->len; i++)
{
FlatpakRelated *rel = g_ptr_array_index (related, i);
FlatpakRelatedRef *ref;
FlatpakRelatedRef *rel_ref;
ref = flatpak_related_ref_new (rel->collection_id, rel->ref, rel->commit,
rel->subpaths, rel->download, rel->delete);
rel_ref = flatpak_related_ref_new (rel->collection_id, rel->ref, rel->commit,
rel->subpaths, rel->download, rel->delete);
if (ref)
g_ptr_array_add (refs, ref);
if (rel_ref)
g_ptr_array_add (refs, rel_ref);
}
return g_steal_pointer (&refs);
@@ -3066,13 +3066,13 @@ flatpak_installation_list_installed_related_refs_sync (FlatpakInstallation *self
for (i = 0; i < related->len; i++)
{
FlatpakRelated *rel = g_ptr_array_index (related, i);
FlatpakRelatedRef *ref;
FlatpakRelatedRef *rel_ref;
ref = flatpak_related_ref_new (rel->collection_id, rel->ref, rel->commit,
rel->subpaths, rel->download, rel->delete);
rel_ref = flatpak_related_ref_new (rel->collection_id, rel->ref, rel->commit,
rel->subpaths, rel->download, rel->delete);
if (ref)
g_ptr_array_add (refs, ref);
if (rel_ref)
g_ptr_array_add (refs, rel_ref);
}
return g_steal_pointer (&refs);

6
common/flatpak-json.c
View File

@@ -162,14 +162,14 @@ demarshal (JsonNode *parent_node,
/* Verify that all members are known properties if strict flag is set */
for (l = members; l != NULL; l = l->next)
{
const char *name = l->data;
const char *member_name = l->data;
for (i = 0; struct_props[i].name != NULL; i++)
{
if (strcmp (struct_props[i].name, name) == 0)
if (strcmp (struct_props[i].name, member_name) == 0)
break;
}
if (struct_props[i].name == NULL)
return flatpak_fail (error, "Unknown property named %s", name);
return flatpak_fail (error, "Unknown property named %s", member_name);
}
}

6
common/flatpak-utils.c
View File

@@ -4755,14 +4755,14 @@ flatpak_extension_new (const char *id,
gboolean
flatpak_extension_matches_reason (const char *extension_id,
const char *reason,
const char *reasons,
gboolean default_value)
{
const char *extension_basename;
g_auto(GStrv) reason_list = NULL;
size_t i;
if (reason == NULL || *reason == 0)
if (reasons == NULL || *reasons == 0)
return default_value;
extension_basename = strrchr (extension_id, '.');
@@ -4770,7 +4770,7 @@ flatpak_extension_matches_reason (const char *extension_id,
return FALSE;
extension_basename += 1;
reason_list = g_strsplit (reason, ";", -1);
reason_list = g_strsplit (reasons, ";", -1);
for (i = 0; reason_list[i]; ++i)
{