[vlc-commits] udev: fix variable shadowing

Rémi Denis-Courmont git at videolan.org
Thu Jun 29 22:35:58 CEST 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 29 23:22:05 2017 +0300| [7b6465ddc6134290a906d3ad7ab768a21c4b3676] | committer: Rémi Denis-Courmont

udev: fix variable shadowing

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b6465ddc6134290a906d3ad7ab768a21c4b3676
---

 modules/services_discovery/udev.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index f4359aa839..8ac528b89d 100644
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -585,21 +585,21 @@ static char *disc_get_name (struct udev_device *dev)
     const char *cat = NULL;
     udev_list_entry_foreach (entry, list)
     {
-        const char *name = udev_list_entry_get_name (entry);
+        const char *propname = udev_list_entry_get_name(entry);
 
-        if (strncmp (name, "ID_CDROM_MEDIA_", 15))
+        if (strncmp(propname, "ID_CDROM_MEDIA_", 15))
             continue;
         if (!atoi (udev_list_entry_get_value (entry)))
             continue;
-        name += 15;
+        propname += 15;
 
-        if (!strncmp (name, "CD", 2))
+        if (!strncmp(propname, "CD", 2))
             cat = N_("CD");
-        else if (!strncmp (name, "DVD", 3))
+        else if (!strncmp(propname, "DVD", 3))
             cat = N_("DVD");
-        else if (!strncmp (name, "BD", 2))
+        else if (!strncmp(propname, "BD", 2))
             cat = N_("Blu-ray");
-        else if (!strncmp (name, "HDDVD", 5))
+        else if (!strncmp(propname, "HDDVD", 5))
             cat = N_("HD DVD");
 
         if (cat != NULL)



More information about the vlc-commits mailing list