From 6aa3ff0d6f01ec411686d461a4c523d9bf2409ed Mon Sep 17 00:00:00 2001
From: Matthew Leeds <matthew.leeds@endlessm.com>
Date: Wed, 11 Mar 2020 17:11:34 -0700
Subject: [PATCH] common: Don't shadow parameter variables

---
 common/flatpak-installation.c | 20 ++++++++++----------
 common/flatpak-json.c         |  6 +++---
 common/flatpak-utils.c        |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/flatpak-installation.c b/common/flatpak-installation.c
index 879fe251..42d6806f 100644
--- a/common/flatpak-installation.c
+++ b/common/flatpak-installation.c
@@ -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);
diff --git a/common/flatpak-json.c b/common/flatpak-json.c
index 2920dc4e..4d684fac 100644
--- a/common/flatpak-json.c
+++ b/common/flatpak-json.c
@@ -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);
               }
           }
 
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index c4527a61..823ad6a2 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -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)
     {