Generic map_str2int generic mapping tables; Removed vector return values from xmldb_get()

lib/clixon/clixon_proto_client.h

@@ -45,7 +45,8 @@ int clicon_rpc_msg(clicon_handle h, struct clicon_msg *msg, cxobj **xret0,
 int clicon_rpc_netconf(clicon_handle h, char *xmlst, cxobj **xret, int *sp);
 int clicon_rpc_netconf_xml(clicon_handle h, cxobj *xml, cxobj **xret, int *sp);
 int clicon_rpc_generate_error(cxobj *xerr);
-int clicon_rpc_get_config(clicon_handle h, char *db, char *xpath, cxobj **xret);
+int clicon_rpc_get_config(clicon_handle h, char *db, char *xpath, 
+			  int errmode, cxobj **xret);
 int clicon_rpc_edit_config(clicon_handle h, char *db, enum operation_type op, 
 			   char *xml);
 int clicon_rpc_copy_config(clicon_handle h, char *db1, char *db2);

lib/clixon/clixon_string.h

@@ -36,6 +36,23 @@
 #ifndef _CLIXON_STRING_H_
 #define _CLIXON_STRING_H_
 
+/* Struct used to map between int and strings. Typically used to map between
+ * values and their names. Note NULL terminated
+ * Example:
+ * @code
+static const map_str2int atmap[] = {
+    {"One",               1}, 
+    {"Two",               2}, 
+    {NULL,               -1}
+};
+ * @endcode
+ */
+struct map_str2int{
+    char         *ms_str;
+    int           ms_int;
+};
+typedef struct map_str2int map_str2int;
+
 /*! A malloc version that aligns on 4 bytes. To avoid warning from valgrind */
 #define align4(s) (((s)/4)*4 + 4)
 
@@ -59,6 +76,9 @@ char *clicon_strjoin (int argc, char **argv, char *delim);
 int str2cvec(char *string, char delim1, char delim2, cvec **cvp);
 int percent_encode(char *str, char **escp);
 int percent_decode(char *esc, char **str);
+const char *clicon_int2str(const map_str2int *mstab, int i);
+int clicon_str2int(const map_str2int *mstab, char *str);
+
 #ifndef HAVE_STRNDUP
 char *clicon_strndup (const char *, size_t);
 #endif /* ! HAVE_STRNDUP */

lib/clixon/clixon_xml_db.h

@@ -75,12 +75,10 @@ typedef int (xmldb_getopt_t)(xmldb_handle xh, char *optname, void **value);
 typedef int (xmldb_setopt_t)(xmldb_handle xh, char *optname, void *value);
 
 /* Type of xmldb get function */
-typedef int (xmldb_get_t)(xmldb_handle xh, char *db, char *xpath,
-	   cxobj **xtop, cxobj ***xvec, size_t *xlen);
+typedef int (xmldb_get_t)(xmldb_handle xh, char *db, char *xpath, cxobj **xtop);
 
 /* Type of xmldb put function */
-typedef int (xmldb_put_t)(xmldb_handle xh, char *db, enum operation_type op, 
-			  cxobj *xt);
+typedef int (xmldb_put_t)(xmldb_handle xh, char *db, enum operation_type op, cxobj *xt);
 
 /* Type of xmldb copy function */
 typedef int (xmldb_copy_t)(xmldb_handle xh, char *from, char *to);
@@ -135,12 +133,12 @@ struct xmldb_api{
 int xmldb_plugin_load(clicon_handle h, char *filename);
 int xmldb_plugin_unload(clicon_handle h);
 
+int xmldb_validate_db(char *db);
 int xmldb_connect(clicon_handle h);
 int xmldb_disconnect(clicon_handle h);
 int xmldb_getopt(clicon_handle h, char *optname, void **value);
 int xmldb_setopt(clicon_handle h, char *optname, void *value);
-int xmldb_get(clicon_handle h, char *db, char *xpath,
-	      cxobj **xtop, cxobj ***xvec, size_t *xlen);
+int xmldb_get(clicon_handle h, char *db, char *xpath, cxobj **xtop);
 int xmldb_put(clicon_handle h, char *db, enum operation_type op, cxobj *xt);
 int xmldb_copy(clicon_handle h, char *from, char *to);
 int xmldb_lock(clicon_handle h, char *db, int pid);

lib/clixon/clixon_xml_map.h

@@ -47,7 +47,8 @@ enum {
     LVXML_VECVAL,   /* key: a.b.0{x=1} -> <a><b><x>1</x></b></a> och */
     LVXML_VECVAL2,  /* key: a.b.0{x=1} -> <a><x>1</x></a> och */
 };
-
+extern const map_str2int netconf_restconf_map[];
+extern const map_str2int http_reason_phrase_map[];
 
 /*
  * Prototypes