From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 8 Jan 2018 16:16:51 +0000 (+0100)
Subject: use new htsmsg add/set uuid functions
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4236863ddd221170d9b77578308d73c82490015;p=thirdparty%2Ftvheadend.git

use new htsmsg add/set uuid functions
---

diff --git a/src/api/api_caclient.c b/src/api/api_caclient.c
index cf14335a9..e090b2917 100644
--- a/src/api/api_caclient.c
+++ b/src/api/api_caclient.c
@@ -32,13 +32,13 @@ api_caclient_list
 {
   caclient_t *cac;
   htsmsg_t *l, *e;
-  char ubuf[UUID_HEX_SIZE], buf[384];
+  char buf[384];
 
   l = htsmsg_create_list();
   pthread_mutex_lock(&global_lock);
   TAILQ_FOREACH(cac, &caclients, cac_link) {
     e = htsmsg_create_map();
-    htsmsg_add_str(e, "uuid", idnode_uuid_as_str(&cac->cac_id, ubuf));
+    htsmsg_add_uuid(e, "uuid", &cac->cac_id.in_uuid);
     htsmsg_add_str(e, "title", idnode_get_title(&cac->cac_id, perm->aa_lang_ui, buf, sizeof(buf)));
     htsmsg_add_str(e, "status", caclient_get_status(cac));
     htsmsg_add_msg(l, NULL, e);
diff --git a/src/api/api_dvr.c b/src/api/api_dvr.c
index 3333f72d6..e6920c6c8 100644
--- a/src/api/api_dvr.c
+++ b/src/api/api_dvr.c
@@ -136,7 +136,6 @@ api_dvr_entry_create
   char *s, *lang;
   const char *s1;
   int res = EPERM;
-  char ubuf[UUID_HEX_SIZE];
 
   if (!(conf = htsmsg_get_map(args, "conf")))
     return EINVAL;
@@ -145,7 +144,7 @@ api_dvr_entry_create
   s1 = htsmsg_get_str(conf, "config_name");
   cfg = dvr_config_find_by_list(perm->aa_dvrcfgs, s1);
   if (cfg) {
-    htsmsg_set_str(conf, "config_name", idnode_uuid_as_str(&cfg->dvr_id, ubuf));
+    htsmsg_set_uuid(conf, "config_name", &cfg->dvr_id.in_uuid);
     htsmsg_set_str(conf, "owner", perm->aa_username ?: "");
     htsmsg_set_str(conf, "creator", perm->aa_representative ?: "");
 
@@ -245,7 +244,7 @@ api_dvr_entry_create_by_event
         if (de) {
           if (l == NULL)
             l = htsmsg_create_list();
-          htsmsg_add_str(l, NULL, idnode_uuid_as_str(&de->de_id, ubuf));
+          htsmsg_add_uuid(l, NULL, &de->de_id.in_uuid);
           idnode_changed(&de->de_id);
         }
       }
@@ -424,7 +423,6 @@ api_dvr_autorec_create
   dvr_config_t *cfg;
   dvr_autorec_entry_t *dae;
   const char *s1;
-  char ubuf[UUID_HEX_SIZE];
 
   if (!(conf  = htsmsg_get_map(args, "conf")))
     return EINVAL;
@@ -439,7 +437,7 @@ api_dvr_autorec_create
   pthread_mutex_lock(&global_lock);
   cfg = dvr_config_find_by_list(perm->aa_dvrcfgs, s1);
   if (cfg) {
-    htsmsg_set_str(conf, "config_name", idnode_uuid_as_str(&cfg->dvr_id, ubuf));
+    htsmsg_set_uuid(conf, "config_name", &cfg->dvr_id.in_uuid);
     dae = dvr_autorec_create(NULL, conf);
     if (dae) {
       api_idnode_create(resp, &dae->dae_id);
@@ -490,7 +488,7 @@ api_dvr_autorec_create_by_series
         if (dae) {
           if (l == NULL)
             l = htsmsg_create_list();
-          htsmsg_add_str(l, NULL, idnode_uuid_as_str(&dae->dae_id, ubuf));
+          htsmsg_add_uuid(l, NULL, &dae->dae_id.in_uuid);
           idnode_changed(&dae->dae_id);
         }
       }
diff --git a/src/api/api_epg.c b/src/api/api_epg.c
index f12d55ebe..30247378c 100644
--- a/src/api/api_epg.c
+++ b/src/api/api_epg.c
@@ -54,10 +54,10 @@ static void
 api_epg_add_channel ( htsmsg_t *m, channel_t *ch, const char *blank )
 {
   int64_t chnum;
-  char buf[32], ubuf[UUID_HEX_SIZE];
+  char buf[32];
   const char *s;
   htsmsg_add_str(m, "channelName", channel_get_name(ch, blank));
-  htsmsg_add_str(m, "channelUuid", channel_get_uuid(ch, ubuf));
+  htsmsg_add_uuid(m, "channelUuid", &ch->ch_id.in_uuid);
   if ((chnum = channel_get_number(ch)) >= 0) {
     uint32_t maj = chnum / CHANNEL_SPLIT;
     uint32_t min = chnum % CHANNEL_SPLIT;
@@ -210,7 +210,7 @@ api_epg_entry ( epg_broadcast_t *eb, const char *lang, access_t *perm, const cha
       if (access_verify_list(perm->aa_dvrcfgs,
                              idnode_uuid_as_str(&de->de_config->dvr_id, ubuf)))
         continue;
-      htsmsg_add_str(m, "dvrUuid", idnode_uuid_as_str(&de->de_id, ubuf));
+      htsmsg_add_uuid(m, "dvrUuid", &de->de_id.in_uuid);
       htsmsg_add_str(m, "dvrState", dvr_entry_schedstatus(de));
       break;
     }
diff --git a/src/api/api_epggrab.c b/src/api/api_epggrab.c
index 5e8d064c1..a3bec0b28 100644
--- a/src/api/api_epggrab.c
+++ b/src/api/api_epggrab.c
@@ -38,11 +38,11 @@ api_epggrab_module_list
 {
   htsmsg_t *l = htsmsg_create_list(), *m;
   epggrab_module_t *mod;
-  char ubuf[UUID_HEX_SIZE], buf[384];
+  char buf[384];
   pthread_mutex_lock(&global_lock);
   LIST_FOREACH(mod, &epggrab_modules, link) {
     m = htsmsg_create_map();
-    htsmsg_add_str(m, "uuid", idnode_uuid_as_str(&mod->idnode, ubuf));
+    htsmsg_add_uuid(m, "uuid", &mod->idnode.in_uuid);
     htsmsg_add_str(m, "status", epggrab_module_get_status(mod));
     htsmsg_add_str(m, "title", idnode_get_title(&mod->idnode, perm->aa_lang_ui, buf, sizeof(buf)));
     htsmsg_add_msg(l, NULL, m);
diff --git a/src/api/api_idnode.c b/src/api/api_idnode.c
index 517315a2f..f2562aa60 100644
--- a/src/api/api_idnode.c
+++ b/src/api/api_idnode.c
@@ -126,7 +126,6 @@ api_idnode_grid
   idnode_t *in;
   idnode_set_t ins = { 0 };
   api_idnode_grid_callback_t cb = opaque;
-  char ubuf[UUID_HEX_SIZE];
 
   /* Grid configuration */
   api_idnode_grid_conf(perm, args, &conf);
@@ -146,7 +145,7 @@ api_idnode_grid
     if (idnode_perm(in, perm, NULL))
       continue;
     e = htsmsg_create_map();
-    htsmsg_add_str(e, "uuid", idnode_uuid_as_str(in, ubuf));
+    htsmsg_add_uuid(e, "uuid", &in->in_uuid);
     idnode_read0(in, e, flist, 0, conf.sort.lang);
     idnode_perm_unset(in);
     htsmsg_add_msg(list, NULL, e);
@@ -241,7 +240,6 @@ api_idnode_load
   htsmsg_t *uuids, *l = NULL, *m, *flist;
   htsmsg_field_t *f;
   const char *uuid = NULL, *class;
-  char ubuf[UUID_HEX_SIZE];
 
   /* Class based */
   if ((class = htsmsg_get_str(args, "class"))) {
@@ -286,7 +284,7 @@ api_idnode_load
       }
       if (grid > 0) {
         m = htsmsg_create_map();
-        htsmsg_add_str(m, "uuid", idnode_uuid_as_str(in, ubuf));
+        htsmsg_add_uuid(m, "uuid", &in->in_uuid);
         idnode_read0(in, m, flist, 0, perm->aa_lang_ui);
       } else {
         m = idnode_serialize0(in, flist, 0, perm->aa_lang_ui);
@@ -310,7 +308,7 @@ api_idnode_load
       } else {
         if (grid > 0) {
           m = htsmsg_create_map();
-          htsmsg_add_str(m, "uuid", idnode_uuid_as_str(in, ubuf));
+          htsmsg_add_uuid(m, "uuid", &in->in_uuid);
           idnode_read0(in, m, flist, 0, perm->aa_lang_ui);
         } else {
           m = idnode_serialize0(in, flist, 0, perm->aa_lang_ui);
@@ -725,12 +723,10 @@ api_idnode_movedown
 void
 api_idnode_create( htsmsg_t **resp, idnode_t *in )
 {
-  char ubuf[UUID_HEX_SIZE];
-
   idnode_changed(in);
   if (*resp == NULL)
     *resp = htsmsg_create_map();
-  htsmsg_add_str(*resp, "uuid", idnode_uuid_as_str(in, ubuf));
+  htsmsg_add_uuid(*resp, "uuid", &in->in_uuid);
 }
 
 void
diff --git a/src/api/api_raw.c b/src/api/api_raw.c
index 96a16c3f9..0c26de47b 100644
--- a/src/api/api_raw.c
+++ b/src/api/api_raw.c
@@ -58,7 +58,6 @@ api_idnode_raw_export_by_class0
   idnode_set_t    *is;
   idnode_t        *in;
   htsmsg_t        *l, *e;
-  char ubuf[UUID_HEX_SIZE];
 
   /* Find class */
   idc = opaque;
@@ -75,7 +74,7 @@ api_idnode_raw_export_by_class0
       e = idnode_savefn(in, NULL, 0);
 
       if (e) {
-        htsmsg_set_str(e, "uuid", idnode_uuid_as_str(in, ubuf));
+        htsmsg_set_uuid(e, "uuid", &in->in_uuid);
         htsmsg_add_msg(l, NULL, e);
       }
 
@@ -99,7 +98,6 @@ api_idnode_raw_export
   htsmsg_t *uuids, *l = NULL, *m;
   htsmsg_field_t *f;
   const char *uuid = NULL, *class;
-  char ubuf[UUID_HEX_SIZE];
 
   /* Class based */
   if ((class = htsmsg_get_str(args, "class"))) {
@@ -137,7 +135,7 @@ api_idnode_raw_export
       }
       m = idnode_savefn(in, NULL, 0);
       if (m) {
-        htsmsg_set_str(m, "uuid", idnode_uuid_as_str(in, ubuf));
+        htsmsg_set_uuid(m, "uuid", &in->in_uuid);
         htsmsg_add_msg(l, NULL, m);
       }
       count++;
@@ -155,7 +153,7 @@ api_idnode_raw_export
       } else {
         m = idnode_savefn(in, NULL, 0);
         if (m) {
-          htsmsg_set_str(m, "uuid", idnode_uuid_as_str(in, ubuf));
+          htsmsg_set_uuid(m, "uuid", &in->in_uuid);
           htsmsg_add_msg(l, NULL, m);
         }
         idnode_perm_unset(in);
diff --git a/src/api/api_service.c b/src/api/api_service.c
index 8ecd870cc..269351291 100644
--- a/src/api/api_service.c
+++ b/src/api/api_service.c
@@ -42,7 +42,6 @@ static htsmsg_t *
 api_mapper_status_msg ( void )
 {
   htsmsg_t *m;
-  char ubuf[UUID_HEX_SIZE];
   service_mapper_status_t stat = service_mapper_status();
   m = htsmsg_create_map();
   htsmsg_add_u32(m, "total",  stat.total);
@@ -50,7 +49,7 @@ api_mapper_status_msg ( void )
   htsmsg_add_u32(m, "fail",   stat.fail);
   htsmsg_add_u32(m, "ignore", stat.ignore);
   if (stat.active)
-    htsmsg_add_str(m, "active", idnode_uuid_as_str(&stat.active->s_id, ubuf));
+    htsmsg_add_uuid(m, "active", &stat.active->s_id.in_uuid);
   return m;
 }
 
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index ed3962841..519eadd57 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -979,7 +979,7 @@ dvr_entry_create_(int enabled, const char *config_uuid, epg_broadcast_t *e,
     htsmsg_add_u32(conf, "enabled", !!enabled);
   htsmsg_add_s64(conf, "start", start);
   htsmsg_add_s64(conf, "stop", stop);
-  htsmsg_add_str(conf, "channel", idnode_uuid_as_str(&ch->ch_id, ubuf));
+  htsmsg_add_uuid(conf, "channel", &ch->ch_id.in_uuid);
   htsmsg_add_u32(conf, "pri", pri);
   htsmsg_add_u32(conf, "retention", retention);
   htsmsg_add_u32(conf, "removal", removal);
@@ -1035,7 +1035,7 @@ dvr_entry_create_(int enabled, const char *config_uuid, epg_broadcast_t *e,
     htsmsg_add_u32(conf, "broadcast", e->id);
   if (dae)
   {
-    htsmsg_add_str(conf, "autorec", idnode_uuid_as_str(&dae->dae_id, ubuf));
+    htsmsg_add_uuid(conf, "autorec", &dae->dae_id.in_uuid);
     htsmsg_add_str(conf, "directory", dae->dae_directory ?: "");
     if (dae->dae_cat1 && *dae->dae_cat1)
       htsmsg_add_str(conf, "cat1", dae->dae_cat1);
@@ -1046,7 +1046,7 @@ dvr_entry_create_(int enabled, const char *config_uuid, epg_broadcast_t *e,
   }
   if (dte)
   {
-    htsmsg_add_str(conf, "timerec", idnode_uuid_as_str(&dte->dte_id, ubuf));
+    htsmsg_add_uuid(conf, "timerec", &dte->dte_id.in_uuid);
     htsmsg_add_str(conf, "directory", dte->dte_directory ?: "");
   }
 
diff --git a/src/idnode.c b/src/idnode.c
index 1701f45ae..ad5bc2717 100644
--- a/src/idnode.c
+++ b/src/idnode.c
@@ -235,8 +235,7 @@ idnode_get_short_uuid (const idnode_t *in)
 const char *
 idnode_uuid_as_str(const idnode_t *in, char *uuid)
 {
-  bin2hex(uuid, UUID_HEX_SIZE, in->in_uuid.bin, sizeof(in->in_uuid.bin));
-  return uuid;
+  return bin2hex(uuid, UUID_HEX_SIZE, in->in_uuid.bin, sizeof(in->in_uuid.bin));
 }
 
 /**
@@ -1107,10 +1106,9 @@ idnode_set_as_htsmsg
   ( idnode_set_t *is )
 {
   htsmsg_t *l = htsmsg_create_list();
-  char ubuf[UUID_HEX_SIZE];
   int i;
   for (i = 0; i < is->is_count; i++)
-    htsmsg_add_str(l, NULL, idnode_uuid_as_str(is->is_array[i], ubuf));
+    htsmsg_add_uuid(l, NULL, &is->is_array[i]->in_uuid);
   return l;
 }
 
@@ -1532,14 +1530,13 @@ htsmsg_t *
 idnode_serialize0(idnode_t *self, htsmsg_t *list, int optmask, const char *lang)
 {
   const idclass_t *idc = self->in_class;
-  const char *uuid, *s;
-  char ubuf[UUID_HEX_SIZE], buf[384];
+  const char *s;
+  char buf[384];
 
   htsmsg_t *m = htsmsg_create_map();
   if (!idc->ic_snode) {
-    uuid = idnode_uuid_as_str(self, ubuf);
-    htsmsg_add_str(m, "uuid", uuid);
-    htsmsg_add_str(m, "id",   uuid);
+    htsmsg_add_uuid(m, "uuid", &self->in_uuid);
+    htsmsg_add_uuid(m, "id",   &self->in_uuid);
   }
   htsmsg_add_str(m, "text", idnode_get_title(self, lang, buf, sizeof(buf)) ?: "");
   if ((s = idclass_get_caption(idc, lang)))
@@ -1749,10 +1746,9 @@ idnode_list_get1
 {
   idnode_list_mapping_t *ilm;
   htsmsg_t *l = htsmsg_create_list();
-  char ubuf[UUID_HEX_SIZE];
 
   LIST_FOREACH(ilm, in1_list, ilm_in1_link)
-    htsmsg_add_str(l, NULL, idnode_uuid_as_str(ilm->ilm_in2, ubuf));
+    htsmsg_add_uuid(l, NULL, &ilm->ilm_in2->in_uuid);
   return l;
 }
 
@@ -1762,10 +1758,9 @@ idnode_list_get2
 {
   idnode_list_mapping_t *ilm;
   htsmsg_t *l = htsmsg_create_list();
-  char ubuf[UUID_HEX_SIZE];
 
   LIST_FOREACH(ilm, in2_list, ilm_in2_link)
-    htsmsg_add_str(l, NULL, idnode_uuid_as_str(ilm->ilm_in1, ubuf));
+    htsmsg_add_uuid(l, NULL, &ilm->ilm_in1->in_uuid);
   return l;
 }
 
@@ -1919,9 +1914,8 @@ idnode_notify_changed (void *in)
 void
 idnode_notify_title_changed (void *in)
 {
-  char ubuf[UUID_HEX_SIZE];
   htsmsg_t *m = htsmsg_create_map();
-  htsmsg_add_str(m, "uuid", idnode_uuid_as_str(in, ubuf));
+  htsmsg_add_uuid(m, "uuid", &((idnode_t *)in)->in_uuid);
   notify_by_msg("title", m, NOTIFY_REWRITE_TITLE);
   idnode_notify_changed(in);
 }
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_ca.c b/src/input/mpegts/linuxdvb/linuxdvb_ca.c
index 7f5d80959..d5055ae00 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_ca.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_ca.c
@@ -781,11 +781,11 @@ static void linuxdvb_ca_destroy( linuxdvb_ca_t *lca )
 
 static void linuxdvb_ca_save( linuxdvb_ca_t *lca, htsmsg_t *msg )
 {
-  char id[8], ubuf[UUID_HEX_SIZE];
+  char id[32];
   htsmsg_t *m = htsmsg_create_map();
   linuxdvb_transport_t *lcat = lca->lca_transport;
 
-  htsmsg_add_str(m, "uuid", idnode_uuid_as_str(&lca->lca_id, ubuf));
+  htsmsg_add_uuid(m, "uuid", &lca->lca_id.in_uuid);
   idnode_save(&lca->lca_id, m);
 
   /* Add to list */
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index fcc7b8cb9..7509f794a 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -2203,17 +2203,17 @@ linuxdvb_frontend_create
 void
 linuxdvb_frontend_save ( linuxdvb_frontend_t *lfe, htsmsg_t *fe )
 {
-  char id[16], ubuf[UUID_HEX_SIZE];
+  char id[16];
   htsmsg_t *m = htsmsg_create_map();
 
   /* Save frontend */
   mpegts_input_save((mpegts_input_t*)lfe, m);
   htsmsg_add_str(m, "type", dvb_type2str(lfe->lfe_type));
-  htsmsg_add_str(m, "uuid", idnode_uuid_as_str(&lfe->ti_id, ubuf));
+  htsmsg_add_uuid(m, "uuid", &lfe->ti_id.in_uuid);
   if (lfe->lfe_satconf && !lfe->lfe_master) {
     htsmsg_t *s = htsmsg_create_map();
     linuxdvb_satconf_save(lfe->lfe_satconf, s);
-    htsmsg_add_str(s, "uuid", idnode_uuid_as_str(&lfe->lfe_satconf->ls_id, ubuf));
+    htsmsg_add_uuid(s, "uuid", &lfe->lfe_satconf->ls_id.in_uuid);
     htsmsg_add_msg(m, "satconf", s);
   }
   htsmsg_delete_field(m, "fe_master");
diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 9a0733324..8aefcc903 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -80,10 +80,9 @@ mpegts_input_class_network_get ( void *obj )
   mpegts_network_link_t *mnl;  
   mpegts_input_t *mi = obj;
   htsmsg_t       *l  = htsmsg_create_list();
-  char ubuf[UUID_HEX_SIZE];
 
   LIST_FOREACH(mnl, &mi->mi_networks, mnl_mi_link)
-    htsmsg_add_str(l, NULL, idnode_uuid_as_str(&mnl->mnl_network->mn_id, ubuf));
+    htsmsg_add_uuid(l, NULL, &mnl->mnl_network->mn_id.in_uuid);
 
   return l;
 }
@@ -98,13 +97,12 @@ htsmsg_t *
 mpegts_input_class_network_enum ( void *obj, const char *lang )
 {
   htsmsg_t *p, *m;
-  char ubuf[UUID_HEX_SIZE];
 
   if (!obj)
     return NULL;
 
   p = htsmsg_create_map();
-  htsmsg_add_str (p, "uuid",    idnode_uuid_as_str((idnode_t*)obj, ubuf));
+  htsmsg_add_uuid(p, "uuid",    &((idnode_t*)obj)->in_uuid);
   htsmsg_add_bool(p, "enum",    1);
 
   m = htsmsg_create_map();
diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index a679608ca..35479e373 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -1280,7 +1280,7 @@ mpegts_mux_save ( mpegts_mux_t *mm, htsmsg_t *c, int refs )
   idnode_save(&mm->mm_id, root);
   LIST_FOREACH(ms, &mm->mm_services, s_dvb_mux_link) {
     if (refs) {
-      htsmsg_add_str(services, NULL, idnode_uuid_as_str(&ms->s_id, ubuf));
+      htsmsg_add_uuid(services, NULL, &ms->s_id.in_uuid);
     } else {
       e = htsmsg_create_map();
       service_save((service_t *)ms, e);
diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c
index f4114db45..fbc50714a 100644
--- a/src/input/mpegts/mpegts_network.c
+++ b/src/input/mpegts/mpegts_network.c
@@ -622,7 +622,7 @@ mpegts_network_wizard_get
     mpegts_network_t *mn, const char *lang )
 {
   htsmsg_t *m = htsmsg_create_map(), *l, *e;
-  char ubuf[UUID_HEX_SIZE], buf[256];
+  char buf[256];
 
   if (mi && idc) {
     mi->mi_display_name(mi, buf, sizeof(buf));
@@ -632,7 +632,7 @@ mpegts_network_wizard_get
     htsmsg_add_msg(l, NULL, e);
     htsmsg_add_msg(m, "mpegts_network_types", l);
     if (mn)
-      htsmsg_add_str(m, "mpegts_network", idnode_uuid_as_str(&mn->mn_id, ubuf));
+      htsmsg_add_uuid(m, "mpegts_network", &mn->mn_id.in_uuid);
   }
   return m;
 }
@@ -641,7 +641,6 @@ void
 mpegts_network_wizard_create
   ( const char *clazz, htsmsg_t **nlist, const char *lang )
 {
-  char buf[256];
   mpegts_network_t *mn;
   mpegts_network_builder_t *mnb;
   htsmsg_t *conf;
@@ -669,7 +668,7 @@ mpegts_network_wizard_create
 found:
   if (mn && nlist) {
     *nlist = htsmsg_create_list();
-    htsmsg_add_str(*nlist, NULL, idnode_uuid_as_str(&mn->mn_id, buf));
+    htsmsg_add_uuid(*nlist, NULL, &mn->mn_id.in_uuid);
   }
 }
 
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index 8d3f24d5b..25a920d28 100644
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -2305,13 +2305,13 @@ satip_frontend_create
 void
 satip_frontend_save ( satip_frontend_t *lfe, htsmsg_t *fe )
 {
-  char id[16], ubuf[UUID_HEX_SIZE];
+  char id[16];
   htsmsg_t *m = htsmsg_create_map();
 
   /* Save frontend */
   mpegts_input_save((mpegts_input_t*)lfe, m);
   htsmsg_add_str(m, "type", dvb_type2str(lfe->sf_type));
-  htsmsg_add_str(m, "uuid", idnode_uuid_as_str(&lfe->ti_id, ubuf));
+  htsmsg_add_uuid(m, "uuid", &lfe->ti_id.in_uuid);
   if (lfe->ti_id.in_class == &satip_frontend_dvbs_class) {
     satip_satconf_save(lfe, m);
     htsmsg_delete_field(m, "networks");
diff --git a/src/input/mpegts/satip/satip_satconf.c b/src/input/mpegts/satip/satip_satconf.c
index 8fb0465dc..b8d17214c 100644
--- a/src/input/mpegts/satip/satip_satconf.c
+++ b/src/input/mpegts/satip/satip_satconf.c
@@ -250,7 +250,6 @@ satip_satconf_class_network_set( void *o, const void *p )
   htsmsg_field_t *f;
   const char *str;
   int i, save;
-  char ubuf[UUID_HEX_SIZE];
 
   HTSMSG_FOREACH(f, msg) {
     if (!(str = htsmsg_field_get_str(f))) continue;
@@ -276,8 +275,7 @@ satip_satconf_class_network_set( void *o, const void *p )
     satip_satconf_t *sfc2;
     TAILQ_FOREACH(sfc2, &lfe->sf_satconf, sfc_link) {
       for (i = 0; i < sfc2->sfc_networks->is_count; i++)
-        htsmsg_add_str(l, NULL,
-                       idnode_uuid_as_str(sfc2->sfc_networks->is_array[i], ubuf));
+        htsmsg_add_uuid(l, NULL, &sfc2->sfc_networks->is_array[i]->in_uuid);
     }
     mpegts_input_class_network_set(lfe, l);
     /* update the slave tuners, too */