From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 1 Apr 2016 18:58:11 +0000 (+0200)
Subject: idnode: call idnode_init more early (class registration)
X-Git-Tag: v4.2.1~760
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=264b4ecabf3abcf02cdaa4620e91dad0b34afacd;p=thirdparty%2Ftvheadend.git

idnode: call idnode_init more early (class registration)
---

diff --git a/src/idnode.c b/src/idnode.c
index 3b4c7dcfc..84da3aed9 100644
--- a/src/idnode.c
+++ b/src/idnode.c
@@ -1351,7 +1351,6 @@ idclass_root_register(const idclass_t *idc)
   r = RB_INSERT_SORTED(&idrootclasses, idclasses_skel, link, ic_cmp);
   if (r) return;
   RB_INIT(&idclasses_skel->nodes);
-  r = idclasses_skel;
   SKEL_USED(idclasses_skel);
   tvhtrace("idnode", "register root class %s", idc->ic_class);
 }
diff --git a/src/main.c b/src/main.c
index 6fd1891f0..acf87fa59 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1052,6 +1052,7 @@ main(int argc, char **argv)
   }
 
   uuid_init();
+  idnode_init();
   config_boot(opt_config, gid, uid);
   tcp_server_preinit(opt_ipv6);
   http_server_init(opt_bindaddr);    // bind to ports only
@@ -1129,7 +1130,6 @@ main(int argc, char **argv)
 
   /* Initialise configuration */
   notify_init();
-  idnode_init();
   spawn_init();
   config_init(opt_nobackup == 0);