From 2242abbd90ce3992f1573786e8ab6ece5be5ffc5 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Sun, 6 Oct 2013 20:39:20 +0100
Subject: [PATCH] service channel: fix confusion in svc/chn mapping links

---
 src/channels.c       |  6 +++---
 src/service.c        |  4 ++--
 src/service_mapper.c | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/channels.c b/src/channels.c
index 25ae315b..905b7f12 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -85,7 +85,7 @@ channel_class_services_get ( void *obj )
   channel_service_mapping_t *csm;
 
   /* Add all */
-  LIST_FOREACH(csm, &ch->ch_services, csm_svc_link)
+  LIST_FOREACH(csm, &ch->ch_services, csm_chn_link)
     htsmsg_add_str(l, NULL, idnode_uuid_as_str(&csm->csm_svc->s_id));
 
   return l;
@@ -99,7 +99,7 @@ channel_class_services_rend ( void *obj )
   channel_t *ch = obj;
   channel_service_mapping_t  *csm;
 
-  LIST_FOREACH(csm, &ch->ch_services, csm_svc_link)
+  LIST_FOREACH(csm, &ch->ch_services, csm_chn_link)
     htsmsg_add_str(l, NULL, idnode_get_title(&csm->csm_svc->s_id) ?: "");
 
   str = htsmsg_list_2_csv(l);
@@ -337,7 +337,7 @@ channel_set_tags_by_list ( channel_t *ch, htsmsg_t *tags )
   /* Mark for deletion */
   LIST_FOREACH(ctm, &ch->ch_ctms, ctm_channel_link)
     ctm->ctm_mark = 1;
-  
+
   /* Link */
   HTSMSG_FOREACH(f, tags)
     if (!htsmsg_field_get_u32(f, &u32)) {
diff --git a/src/service.c b/src/service.c
index 77b253c5..77d47690 100644
--- a/src/service.c
+++ b/src/service.c
@@ -91,7 +91,7 @@ service_class_channel_set
   channel_service_mapping_t *csm, *n;
 
   /* Mark all for deletion */
-  LIST_FOREACH(csm, &svc->s_channels, csm_chn_link)
+  LIST_FOREACH(csm, &svc->s_channels, csm_svc_link)
     csm->csm_mark = 1;
 
   /* Make new links */
@@ -103,7 +103,7 @@ service_class_channel_set
 
   /* Delete unlinked */
   for (csm = LIST_FIRST(&svc->s_channels); csm != NULL; csm = n ) {
-    n = LIST_NEXT(csm, csm_chn_link);
+    n = LIST_NEXT(csm, csm_svc_link);
     if (csm->csm_mark) {
       save = 1;
       LIST_REMOVE(csm, csm_chn_link);
diff --git a/src/service_mapper.c b/src/service_mapper.c
index e52451c3..af9c5c14 100644
--- a/src/service_mapper.c
+++ b/src/service_mapper.c
@@ -157,12 +157,12 @@ service_mapper_link ( service_t *s, channel_t *c )
   channel_service_mapping_t *csm;
 
   /* Already linked */
-  LIST_FOREACH(csm, &s->s_channels, csm_chn_link)
+  LIST_FOREACH(csm, &s->s_channels, csm_svc_link)
     if (csm->csm_chn == c) {
       csm->csm_mark = 0;
       return 0;
     }
-  LIST_FOREACH(csm, &c->ch_services, csm_svc_link)
+  LIST_FOREACH(csm, &c->ch_services, csm_chn_link)
     if (csm->csm_svc == s) {
       csm->csm_mark = 0;
       return 0;
@@ -172,8 +172,8 @@ service_mapper_link ( service_t *s, channel_t *c )
   csm = calloc(1, sizeof(channel_service_mapping_t));
   csm->csm_chn = c;
   csm->csm_svc = s;
-  LIST_INSERT_HEAD(&s->s_channels,  csm, csm_chn_link);
-  LIST_INSERT_HEAD(&c->ch_services, csm, csm_svc_link);
+  LIST_INSERT_HEAD(&s->s_channels,  csm, csm_svc_link);
+  LIST_INSERT_HEAD(&c->ch_services, csm, csm_chn_link);
   return 1;
 }
 
@@ -183,7 +183,7 @@ service_mapper_unlink ( service_t *s, channel_t *c )
   channel_service_mapping_t *csm;
 
   /* Unlink */
-  LIST_FOREACH(csm, &s->s_channels, csm_chn_link) {
+  LIST_FOREACH(csm, &s->s_channels, csm_svc_link) {
     if (csm->csm_chn == c) {
       LIST_REMOVE(csm, csm_chn_link);
       LIST_REMOVE(csm, csm_svc_link);