idnode: call idnode_init more early (class registration)

tvheadend · Apr 1, 2016 · 264b4ec · 264b4ec
1 parent 7979566
commit 264b4ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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);