From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 10 Mar 2017 10:41:50 +0000 (+0100)
Subject: rename uuid_copy to uuid_duplicate to avoid clash with uuid library, fixes #4276
X-Git-Tag: v4.2.1~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8610b721ded589157c465fa023913bf1a566b337;p=thirdparty%2Ftvheadend.git

rename uuid_copy to uuid_duplicate to avoid clash with uuid library, fixes #4276
---

diff --git a/src/idnode.c b/src/idnode.c
index 67f09151c..80b729452 100644
--- a/src/idnode.c
+++ b/src/idnode.c
@@ -108,7 +108,7 @@ idnode_insert(idnode_t *in, const char *uuid, const idclass_t *class, int flags)
       in->in_class = NULL;
       return -1;
     }
-    uuid_copy(&in->in_uuid, &u);
+    uuid_duplicate(&in->in_uuid, &u);
 
     c = NULL;
     if (flags & IDNODE_SHORT_UUID) {
diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c
index 3c2ad83da..d95b78faf 100644
--- a/src/input/mpegts/mpegts_service.c
+++ b/src/input/mpegts/mpegts_service.c
@@ -457,8 +457,8 @@ mpegts_service_setsourceinfo(service_t *t, source_info_t *si)
   memset(si, 0, sizeof(struct source_info));
   si->si_type = S_MPEG_TS;
 
-  uuid_copy(&si->si_network_uuid, &m->mm_network->mn_id.in_uuid);
-  uuid_copy(&si->si_mux_uuid, &m->mm_id.in_uuid);
+  uuid_duplicate(&si->si_network_uuid, &m->mm_network->mn_id.in_uuid);
+  uuid_duplicate(&si->si_mux_uuid, &m->mm_id.in_uuid);
 
   if(m->mm_network->mn_network_name != NULL)
     si->si_network = strdup(m->mm_network->mn_network_name);
@@ -470,7 +470,7 @@ mpegts_service_setsourceinfo(service_t *t, source_info_t *si)
 
   if(s->s_dvb_active_input) {
     mpegts_input_t *mi = s->s_dvb_active_input;
-    uuid_copy(&si->si_adapter_uuid, &mi->ti_id.in_uuid);
+    uuid_duplicate(&si->si_adapter_uuid, &mi->ti_id.in_uuid);
     mi->mi_display_name(mi, buf, sizeof(buf));
     si->si_adapter = strdup(buf);
   }
diff --git a/src/uuid.h b/src/uuid.h
index e8c6c0cb0..2daff1cbd 100644
--- a/src/uuid.h
+++ b/src/uuid.h
@@ -64,7 +64,7 @@ int uuid_hex2bin  ( const tvh_uuid_t *a, tvh_uuid_t *b );
 /**
  * Copy
  */
-static inline void uuid_copy ( tvh_uuid_t *dst, const tvh_uuid_t *src )
+static inline void uuid_duplicate ( tvh_uuid_t *dst, const tvh_uuid_t *src )
 {
   *dst = *src;
 }