diff options
| author |   Andrej Kozemcak <andrej.kozemcak@pantheon.tech> | 2019-03-08 13:52:16 +0100 |
|---|---|---|
| committer | Andrej Kozemcak <andrej.kozemcak@pantheon.tech> | 2019-03-08 13:52:16 +0100 |
| commit | 3b2275f5570fc11f17301ccf080df21a6a0573a6 (patch) | |
| tree | 50d28ebf13eda21880b1a55ecf0599eeb93e85ed | |
| parent | d7b6abb9e9e7a1e8eed4374f97374b7175126488 (diff) | |
Move sys_util files to plugins root directory
Change-Id: I2c7041fd34a99ebbe8e7a20ce87da9f39e548458
Signed-off-by: Andrej Kozemcak <andrej.kozemcak@pantheon.tech>
| -rw-r--r-- | src/plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/openconfig/openconfig_interfaces.c | 2 | ||||
| -rw-r--r-- | src/plugins/openconfig/openconfig_local_routing.c | 2 | ||||
| -rw-r--r-- | src/plugins/sys_util.c (renamed from src/plugins/openconfig/sys_util.c) | 2 | ||||
| -rw-r--r-- | src/plugins/sys_util.h (renamed from src/plugins/openconfig/sys_util.h) | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index f9bc5ea..e8b69e7 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -46,10 +46,10 @@ endif() set(PLUGINS_SOURCES sc_plugins.c sc_model.c + sys_util.c ietf/ietf_interface.c openconfig/openconfig_interfaces.c openconfig/openconfig_local_routing.c - openconfig/sys_util.c ) # build the source code into shared library diff --git a/src/plugins/openconfig/openconfig_interfaces.c b/src/plugins/openconfig/openconfig_interfaces.c index 85339af..c72ad7f 100644 --- a/src/plugins/openconfig/openconfig_interfaces.c +++ b/src/plugins/openconfig/openconfig_interfaces.c @@ -18,7 +18,7 @@ #include <string.h> #include "openconfig_interfaces.h" -#include "sys_util.h" +#include "../sys_util.h" #include "sc_vpp_comm.h" #include "sc_vpp_interface.h" diff --git a/src/plugins/openconfig/openconfig_local_routing.c b/src/plugins/openconfig/openconfig_local_routing.c index 39481e1..5c63eaa 100644 --- a/src/plugins/openconfig/openconfig_local_routing.c +++ b/src/plugins/openconfig/openconfig_local_routing.c @@ -19,7 +19,7 @@ #include "openconfig_local_routing.h" -#include "sys_util.h" +#include "../sys_util.h" #include "sc_vpp_comm.h" #include "sc_vpp_interface.h" diff --git a/src/plugins/openconfig/sys_util.c b/src/plugins/sys_util.c index 1a0ee9b..7bd0937 100644 --- a/src/plugins/openconfig/sys_util.c +++ b/src/plugins/sys_util.c @@ -18,7 +18,7 @@ #include "sc_vpp_comm.h" #include <string.h> -#include <vppinfra/types.h> +#include <sysrepo/plugins.h> char* xpath_find_first_key(const char *xpath, char *key, sr_xpath_ctx_t *state) { diff --git a/src/plugins/openconfig/sys_util.h b/src/plugins/sys_util.h index d525066..6c227c3 100644 --- a/src/plugins/openconfig/sys_util.h +++ b/src/plugins/sys_util.h @@ -19,7 +19,6 @@ #include <sysrepo.h> #include <sysrepo/xpath.h> -#include <sysrepo/plugins.h> #define XPATH_SIZE 2000 |