Fixes for info level compilation
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 23 Mar 2017 06:47:10 +0000 (07:47 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 23 Mar 2017 06:47:10 +0000 (07:47 +0100)
src-api/core/oonf_cfg.c
src-plugins/generic/cfg_uciloader/cfg_uciloader.c
src-plugins/nhdp/ff_dat_metric/ff_dat_metric.c
tests/rfc5444/test_rfc5444_writer_mandatory.c

index df12b7b..70d9974 100644 (file)
@@ -275,7 +275,6 @@ oonf_cfg_load_subsystems(void) {
     }
 
     if (!found) {
-      /* TODO: initiate shutdown */
       /* if not, unload it (if not static) */
       oonf_subsystem_unload(plugin);
     }
index 5ee4f9e..b8f21ab 100644 (file)
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <uci.h>
+#undef container_of
+
+#include "common/common_types.h"
 #include "common/autobuf.h"
 #include "config/cfg_io.h"
 #include "config/cfg.h"
@@ -57,8 +61,6 @@
 
 #include "core/oonf_cfg.h"
 
-#include <uci.h>
-
 #include "cfg_uciloader/cfg_uciloader.h"
 
 static void _early_cfg_init(void);
index f4088cc..fb8dbac 100644 (file)
@@ -932,8 +932,8 @@ _cb_process_packet(struct rfc5444_reader_tlvblock_context *context) {
   struct nhdp_link *lnk;
   int total;
 
-  struct netaddr_str nbuf;
 #ifdef OONF_LOG_DEBUG_INFO
+  struct netaddr_str nbuf;
   struct isonumber_str timebuf;
 #endif
 
index b393b5e..1b17f25 100644 (file)
@@ -239,10 +239,8 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
 
   BEGIN_TESTING(clear_elements);
 
-  if (0) {
-    test_frag_80_1();
-    test_frag_80_2();
-  }
+  test_frag_80_1();
+  test_frag_80_2();
   test_frag_50_3();
 
   rfc5444_writer_cleanup(&writer);