From 25cc14c1a20b46dad2f6e482a6ffb5f269112dea Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 12 May 2023 11:03:36 +0200
Subject: [PATCH] Minor rearrangement for exporting cli fns

---
 apps/cli/cli_common.c     | 5 +++--
 apps/cli/clixon_cli_api.h | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index 3bada048..9a853b86 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -186,7 +186,7 @@ cli_signal_flush(clicon_handle h)
  * Create and add an XML body as child of XML node xbot. Set its value to the last 
  * CLI variable vector element. 
  */
-static int
+int
 dbxml_body(cxobj     *xbot,
            cvec      *cvv)
 {
@@ -216,7 +216,7 @@ dbxml_body(cxobj     *xbot,
 /*! Special handling of identityref:s whose body may be: <namespace prefix>:<id>
  * Ensure the namespace is declared if it exists in YANG
 */
-static int
+int
 identityref_add_ns(cxobj *x,
                    void  *arg)
 {
@@ -345,6 +345,7 @@ mtpoint_paths(yang_stmt  *yspec0,
 }
 
 /*! Modify xml datastore from a callback using xml key format strings
+ *
  * @param[in]  h     Clicon handle
  * @param[in]  cvv   Vector of cli string and instantiated variables 
  * @param[in]  argv  Vector: <apipathfmt> [<mointpt>], eg "/aaa/%s"
diff --git a/apps/cli/clixon_cli_api.h b/apps/cli/clixon_cli_api.h
index 05349876..faa01379 100644
--- a/apps/cli/clixon_cli_api.h
+++ b/apps/cli/clixon_cli_api.h
@@ -83,6 +83,9 @@ int cli_notification_register(clicon_handle h, char *stream, enum format_enum fo
 /* cli_common.c: CLIgen new vector callbacks */
 
 int mtpoint_paths(yang_stmt *yspec0, char *mtpoint, char *api_path_fmt1, char **api_path_fmt01);
+int dbxml_body(cxobj *xbot, cvec *cvv);
+int identityref_add_ns(cxobj *x, void *arg);
+
 int cli_dbxml(clicon_handle h, cvec *vars, cvec *argv, enum operation_type op, cvec *nsctx);
 int cli_set(clicon_handle h, cvec *vars, cvec *argv);
 int cli_merge(clicon_handle h, cvec *vars, cvec *argv);
@@ -108,8 +111,8 @@ int db_copy(clicon_handle h, cvec *cvv, cvec *argv);
 int cli_lock(clicon_handle h, cvec *cvv, cvec *argv);
 int cli_unlock(clicon_handle h, cvec *cvv, cvec *argv);
 int cli_copy_config(clicon_handle h, cvec *cvv, cvec *argv);
-
 int cli_help(clicon_handle h, cvec *vars, cvec *argv);
+cvec *cvec_append(cvec *cvv0, cvec *cvv1);
 
 /* In cli_show.c */
 int expand_dbvar(void *h, char *name, cvec *cvv, cvec *argv,