[vlc-devel] [PATCH 7/9] services_discovery: use a name for the sd list item that reflects which list fills it

[Steve Lhomme]

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

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index bff6fc9715..3d2c98a848 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -35,7 +35,7 @@ typedef struct vlc_sd_internal_t
     /* the playlist items for category and onelevel */
     playlist_item_t      *node;
     services_discovery_t *sd; /**< Loaded service discovery modules */
-    vlc_list_node        siblings;  /* from list playlist_private_t.sds */
+    vlc_list_node        sds_item;  /* from list playlist_private_t.sds */
     char name[];
 } vlc_sd_internal_t;
 
@@ -147,7 +147,7 @@ int playlist_ServicesDiscoveryAdd(playlist_t *playlist, const char *chain)
                                         &playlist->root, PLAYLIST_END,
                                         PLAYLIST_RO_FLAG);
 
-    vlc_list_append(&sds->siblings, &pl_priv(playlist)->sds);
+    vlc_list_append(&sds->sds_item, &pl_priv(playlist)->sds);
     playlist_Unlock(playlist);
     return VLC_SUCCESS;
 }
@@ -175,11 +175,11 @@ int playlist_ServicesDiscoveryRemove(playlist_t *playlist, const char *name)
     vlc_sd_internal_t *sds = NULL, *entry;
 
     playlist_Lock(playlist);
-    vlc_list_foreach(entry, &priv->sds, siblings)
+    vlc_list_foreach(entry, &priv->sds, sds_item)
         if (!strcmp(name, entry->name))
         {
             sds = entry;
-            vlc_list_remove(&sds->siblings);
+            vlc_list_remove(&sds->sds_item);
             break;
         }
     playlist_Unlock(playlist);
@@ -202,7 +202,7 @@ bool playlist_IsServicesDiscoveryLoaded( playlist_t * playlist,
     bool found = false;
 
     playlist_Lock(playlist);
-    vlc_list_foreach(sds, &priv->sds, siblings)
+    vlc_list_foreach(sds, &priv->sds, sds_item)
         if (!strcmp(psz_name, sds->name))
         {
             found = true;
@@ -219,7 +219,7 @@ int playlist_ServicesDiscoveryControl( playlist_t *playlist, const char *psz_nam
     int i_ret = VLC_EGENERIC;
 
     playlist_Lock(playlist);
-    vlc_list_foreach(sds, &priv->sds, siblings)
+    vlc_list_foreach(sds, &priv->sds, sds_item)
         if (!strcmp(psz_name, sds->name))
         {
             va_list args;
@@ -238,6 +238,6 @@ void playlist_ServicesDiscoveryKillAll(playlist_t *playlist)
     playlist_private_t *priv = pl_priv(playlist);
     vlc_sd_internal_t *sds;
 
-    vlc_list_foreach(sds, &priv->sds, siblings)
+    vlc_list_foreach(sds, &priv->sds, sds_item)
         playlist_ServicesDiscoveryInternalRemove(playlist, sds);
 }
-- 
2.17.0