From 391179730e5e9a25aae0aa2fca61ab6c08995a30 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Fri, 26 Jan 2024 10:08:13 +0100 Subject: [PATCH] ADdded proper include files from previous withdefault patch --- lib/src/clixon_client.c | 2 +- lib/src/clixon_debug.c | 1 + lib/src/clixon_err.c | 1 + lib/src/clixon_log.c | 1 + lib/src/clixon_netconf_input.c | 2 +- lib/src/clixon_netconf_lib.c | 2 +- lib/src/clixon_netconf_monitoring.c | 2 +- lib/src/clixon_proto.c | 2 +- lib/src/clixon_proto_client.c | 2 +- lib/src/clixon_stream.c | 2 +- lib/src/clixon_text_syntax.c | 1 + lib/src/clixon_xml.c | 1 + lib/src/clixon_xml_sort.c | 1 + lib/src/clixon_xml_vec.c | 1 + lib/src/clixon_yang_module.c | 2 +- lib/src/clixon_yang_schema_mount.c | 2 +- 16 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/src/clixon_client.c b/lib/src/clixon_client.c index 277322da..c52e0862 100644 --- a/lib/src/clixon_client.c +++ b/lib/src/clixon_client.c @@ -61,10 +61,10 @@ #include "clixon_options.h" #include "clixon_proc.h" #include "clixon_xml_nsctx.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xpath_ctx.h" #include "clixon_xpath.h" -#include "clixon_netconf_lib.h" #include "clixon_proto.h" #include "clixon_proto_client.h" #include "clixon_client.h" diff --git a/lib/src/clixon_debug.c b/lib/src/clixon_debug.c index 4f089112..e045a0c9 100644 --- a/lib/src/clixon_debug.c +++ b/lib/src/clixon_debug.c @@ -66,6 +66,7 @@ #include "clixon_err.h" #include "clixon_log.h" #include "clixon_debug.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_yang_module.h" #include "clixon_plugin.h" diff --git a/lib/src/clixon_err.c b/lib/src/clixon_err.c index 30aa7c79..87a599ce 100644 --- a/lib/src/clixon_err.c +++ b/lib/src/clixon_err.c @@ -68,6 +68,7 @@ #include "clixon_log.h" #include "clixon_debug.h" #include "clixon_err.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_yang_module.h" #include "clixon_plugin.h" diff --git a/lib/src/clixon_log.c b/lib/src/clixon_log.c index ace8046d..fe5e7ffc 100644 --- a/lib/src/clixon_log.c +++ b/lib/src/clixon_log.c @@ -66,6 +66,7 @@ #include "clixon_err.h" #include "clixon_debug.h" #include "clixon_log.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_yang_module.h" #include "clixon_plugin.h" diff --git a/lib/src/clixon_netconf_input.c b/lib/src/clixon_netconf_input.c index 2fe2e5bb..0d3ee2bb 100644 --- a/lib/src/clixon_netconf_input.c +++ b/lib/src/clixon_netconf_input.c @@ -71,9 +71,9 @@ #include "clixon_err.h" #include "clixon_log.h" #include "clixon_debug.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_proto.h" -#include "clixon_netconf_lib.h" #include "clixon_netconf_input.h" /*! Read from socket and append to cbuf diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c index b272a320..44039fea 100644 --- a/lib/src/clixon_netconf_lib.c +++ b/lib/src/clixon_netconf_lib.c @@ -69,13 +69,13 @@ #include "clixon_data.h" #include "clixon_xml_bind.h" #include "clixon_xml_map.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xpath_ctx.h" #include "clixon_xpath.h" #include "clixon_yang_module.h" #include "clixon_yang_parse_lib.h" #include "clixon_plugin.h" -#include "clixon_netconf_lib.h" #include "clixon_netconf_input.h" /* Mapping between RFC6243 withdefaults strings <--> ints diff --git a/lib/src/clixon_netconf_monitoring.c b/lib/src/clixon_netconf_monitoring.c index 876a7f09..17589ecd 100644 --- a/lib/src/clixon_netconf_monitoring.c +++ b/lib/src/clixon_netconf_monitoring.c @@ -61,8 +61,8 @@ #include "clixon_log.h" #include "clixon_debug.h" #include "clixon_yang_module.h" -#include "clixon_xml_io.h" #include "clixon_netconf_lib.h" +#include "clixon_xml_io.h" #include "clixon_options.h" #include "clixon_data.h" #include "clixon_datastore.h" diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c index e17ecc8e..1ba79a46 100644 --- a/lib/src/clixon_proto.c +++ b/lib/src/clixon_proto.c @@ -75,8 +75,8 @@ #include "clixon_log.h" #include "clixon_debug.h" #include "clixon_sig.h" -#include "clixon_xml_io.h" #include "clixon_netconf_lib.h" +#include "clixon_xml_io.h" #include "clixon_options.h" #include "clixon_proto.h" diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c index 57651b64..62378e78 100644 --- a/lib/src/clixon_proto_client.c +++ b/lib/src/clixon_proto_client.c @@ -80,8 +80,8 @@ #include "clixon_xml_nsctx.h" #include "clixon_xml_bind.h" #include "clixon_xml_sort.h" -#include "clixon_xml_io.h" #include "clixon_netconf_lib.h" +#include "clixon_xml_io.h" #include "clixon_proto_client.h" #define PERSIST_ID_XML_FMT "%s" diff --git a/lib/src/clixon_stream.c b/lib/src/clixon_stream.c index 5baa5508..2222aeac 100644 --- a/lib/src/clixon_stream.c +++ b/lib/src/clixon_stream.c @@ -80,8 +80,8 @@ #include "clixon_log.h" #include "clixon_debug.h" #include "clixon_event.h" -#include "clixon_xml_io.h" #include "clixon_netconf_lib.h" +#include "clixon_xml_io.h" #include "clixon_options.h" #include "clixon_data.h" #include "clixon_xpath_ctx.h" diff --git a/lib/src/clixon_text_syntax.c b/lib/src/clixon_text_syntax.c index dfa413c3..1733d014 100644 --- a/lib/src/clixon_text_syntax.c +++ b/lib/src/clixon_text_syntax.c @@ -62,6 +62,7 @@ #include "clixon_log.h" #include "clixon_debug.h" #include "clixon_options.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xml_sort.h" #include "clixon_xml_nsctx.h" diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c index 83f3acec..01d8c09c 100644 --- a/lib/src/clixon_xml.c +++ b/lib/src/clixon_xml.c @@ -72,6 +72,7 @@ #include "clixon_xml_map.h" /* xml_bind_yang */ #include "clixon_xml_vec.h" #include "clixon_xml_sort.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xml_parse.h" #include "clixon_xml_nsctx.h" diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c index fa1f4ae9..bd091095 100644 --- a/lib/src/clixon_xml_sort.c +++ b/lib/src/clixon_xml_sort.c @@ -64,6 +64,7 @@ #include "clixon_log.h" #include "clixon_debug.h" #include "clixon_xml_nsctx.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xpath_ctx.h" #include "clixon_xpath.h" diff --git a/lib/src/clixon_xml_vec.c b/lib/src/clixon_xml_vec.c index 0906addd..60838b74 100644 --- a/lib/src/clixon_xml_vec.c +++ b/lib/src/clixon_xml_vec.c @@ -62,6 +62,7 @@ #include "clixon_err.h" #include "clixon_log.h" #include "clixon_debug.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xml_vec.h" diff --git a/lib/src/clixon_yang_module.c b/lib/src/clixon_yang_module.c index 86f7c634..68cad6ec 100644 --- a/lib/src/clixon_yang_module.c +++ b/lib/src/clixon_yang_module.c @@ -71,6 +71,7 @@ #include "clixon_err.h" #include "clixon_log.h" #include "clixon_debug.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xml_nsctx.h" #include "clixon_xpath_ctx.h" @@ -79,7 +80,6 @@ #include "clixon_data.h" #include "clixon_yang_module.h" #include "clixon_plugin.h" -#include "clixon_netconf_lib.h" #include "clixon_xml_map.h" #include "clixon_yang_parse_lib.h" diff --git a/lib/src/clixon_yang_schema_mount.c b/lib/src/clixon_yang_schema_mount.c index 498a5850..3da01ab7 100644 --- a/lib/src/clixon_yang_schema_mount.c +++ b/lib/src/clixon_yang_schema_mount.c @@ -76,6 +76,7 @@ #include "clixon_err.h" #include "clixon_log.h" #include "clixon_debug.h" +#include "clixon_netconf_lib.h" #include "clixon_xml_io.h" #include "clixon_xml_map.h" #include "clixon_data.h" @@ -86,7 +87,6 @@ #include "clixon_plugin.h" #include "clixon_xml_bind.h" #include "clixon_xml_nsctx.h" -#include "clixon_netconf_lib.h" #include "clixon_yang_schema_mount.h" /*! Check if YANG node is a RFC 8525 YANG schema mount