rename tree_resolve_read_master_cdb and tree_resolve_write_master_cdb function...

rename tree_resolve_read_master_cdb and tree_resolve_write_master_cdb function to tree_resolve_master_read_cdb and tree_resolve_master_write_cdb respectively

src/lib66/tree/tree_resolve_read_master_cdb.c → src/lib66/tree/tree_resolve_master_read_cdb.c

 /*
- * tree_resolve_read_master_cdb.c
+ * tree_resolve_master_read_cdb.c
  *
  * Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
  *
@@ -23,7 +23,7 @@
 #include <66/tree.h>
 #include <66/resolve.h>
 
-int tree_resolve_read_master_cdb(cdb *c, resolve_tree_master_t *mres)
+int tree_resolve_master_read_cdb(cdb *c, resolve_tree_master_t *mres)
 {
     log_flow() ;
 
@@ -51,10 +51,18 @@ int tree_resolve_read_master_cdb(cdb *c, resolve_tree_master_t *mres)
     resolve_find_cdb(&tmp,c,"current") ;
     mres->current = tmp.len ? resolve_add_string(wres,tmp.s) : 0 ;
 
+    /* contents */
+    resolve_find_cdb(&tmp,c,"contents") ;
+    mres->contents = tmp.len ? resolve_add_string(wres,tmp.s) : 0 ;
+
     /* nenabled */
     x = resolve_find_cdb(&tmp,c,"nenabled") ;
     mres->nenabled = x ;
 
+    /* ncontents */
+    x = resolve_find_cdb(&tmp,c,"ncontents") ;
+    mres->ncontents = x ;
+
     free(wres) ;
     stralloc_free(&tmp) ;
 

src/lib66/tree/tree_resolve_write_master_cdb.c → src/lib66/tree/tree_resolve_master_write_cdb.c

 /*
- * tree_resolve_write_master_cdb.c
+ * tree_resolve_master_write_cdb.c
  *
  * Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
  *
@@ -19,7 +19,7 @@
 #include <66/tree.h>
 #include <66/resolve.h>
 
-int tree_resolve_write_master_cdb(cdbmaker *c, resolve_tree_master_t *mres)
+int tree_resolve_master_write_cdb(cdbmaker *c, resolve_tree_master_t *mres)
 {
     log_flow() ;
 
@@ -37,8 +37,14 @@ int tree_resolve_write_master_cdb(cdbmaker *c, resolve_tree_master_t *mres)
     /* current */
     !resolve_add_cdb(c,"current",str + mres->current) ||
 
+    /* contents */
+    !resolve_add_cdb(c,"contents",str + mres->contents) ||
+
     /* nenabled */
-    !resolve_add_cdb_uint(c,"nenabled",mres->nenabled)) return 0 ;
+    !resolve_add_cdb_uint(c,"nenabled",mres->nenabled) ||
+
+    /* ncontents */
+    !resolve_add_cdb_uint(c,"ncontents",mres->ncontents)) return 0 ;
 
     return 1 ;
 }