datastore handles

lib/clixon/clixon.h.in

@@ -76,13 +76,12 @@
 #include <clixon/clixon_xml.h>
 #include <clixon/clixon_proto.h>
 #include <clixon/clixon_proto_client.h>
+#include <clixon/clixon_plugin.h>
 #include <clixon/clixon_options.h>
 #include <clixon/clixon_xml_map.h>
 #include <clixon/clixon_xml_db.h>
 #include <clixon/clixon_xsl.h>
 #include <clixon/clixon_json.h>
-#include <clixon/clixon_plugin.h>
-#include <clixon/clixon_plugin.h>
 
 /*
  * Global variables generated by Makefile

lib/clixon/clixon_handle.h

@@ -71,10 +71,4 @@ clicon_hash_t *clicon_options(clicon_handle h);
 /* Return internal clicon data (hash-array) given a handle.*/
 clicon_hash_t *clicon_data(clicon_handle h);
 
-/* Set or reset XMLDB storage handle */
-int clicon_handle_xmldb_set(clicon_handle h, void *xh); /* ie xmldb_handle */
-
-/* Get XMLDB storage handle */
-void *clicon_handle_xmldb_get(clicon_handle h);
-
 #endif  /* _CLIXON_HANDLE_H_ */

lib/clixon/clixon_options.h

@@ -120,4 +120,16 @@ int clicon_dbspec_yang_set(clicon_handle h, struct yang_spec *ys);
 char *clicon_dbspec_name(clicon_handle h);
 int clicon_dbspec_name_set(clicon_handle h, char *name);
 
+int clicon_xmldb_plugin_set(clicon_handle h, plghndl_t handle);
+
+plghndl_t clicon_xmldb_plugin_get(clicon_handle h);
+
+int clicon_xmldb_api_set(clicon_handle h, void *xa_api);
+
+void *clicon_xmldb_api_get(clicon_handle h);
+
+int clicon_xmldb_handle_set(clicon_handle h, void *xh);
+
+void *clicon_xmldb_handle_get(clicon_handle h);
+
 #endif  /* _CLIXON_OPTIONS_H_ */