Formatting and CHANGELOG updates

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Clixon Changelog
 
-* [7.1.0](#710) Expected: May 2024
+* [7.1.0](#710) Expected: June 2024
+* [7.0.1](#701) 3 April 2024
 * [7.0.0](#700) 8 March 2024
 * [6.5.0](#650) 6 December 2023
 * [6.4.0](#640) 30 September 2023
@@ -10,7 +11,13 @@
 * [6.0.0](#600) 29 Nov 2022
 
 ## 7.1.0
-Expected: May 2024
+Expected: June 2024
+
+
+## 7.0.1
+3 April 2024
+
+Three issues detected in post-testing of 7.0.0 are fixed in the 7.0.1 release
 
 ### Corrected Bugs
 

apps/backend/backend_commit.c

@@ -179,9 +179,6 @@ startup_common(clixon_handle       h,
         if ((msdiff = modstate_diff_new()) == NULL)
             goto done;
     clixon_debug(CLIXON_DBG_BACKEND, "Reading initial config from %s", db);
-    /* Get the startup datastore WITHOUT binding to YANG, sorting and default setting. 
-     * It is done below, later in this function
-     */
     if (clicon_option_bool(h, "CLICON_XMLDB_UPGRADE_CHECKOLD")){
         if ((ret = xmldb_get0(h, db, YB_MODULE, NULL, "/", 0, 0, &xt, msdiff, &xerr)) < 0)
             goto done;
@@ -200,6 +197,9 @@ startup_common(clixon_handle       h,
         }
     }
     else {
+        /* Get the startup datastore WITHOUT binding to YANG, sorting and default setting.
+         * It is done below, later in this function
+         */
         if (xmldb_get0(h, db, YB_NONE, NULL, "/", 0, 0, &xt, msdiff, &xerr) < 0)
             goto done;
     }

doc/DEVELOP.md

@@ -192,6 +192,7 @@ Create release branch:
   git checkout -b release-4.2 4.2.0
   git push origin release-4.2
 ```
+* Add release branch to .github/workflows/ci.yml
 
 Merge a branch back:
 ```

lib/src/clixon_nacm.c

@@ -694,16 +694,16 @@ nacm_datanode_write(clixon_handle    h,
                     cxobj           *xnacm,
                     cbuf            *cbret)
 {
-    int             retval = -1;
-    cxobj         **gvec = NULL; /* groups */
-    size_t          glen;
-    cxobj         **rlistvec = NULL; /* rule-list */
-    size_t          rlistlen;
-    cxobj         **rvec = NULL; /* rules */
-    char           *write_default = NULL;
-    cvec           *nsc = NULL;
-    int             ret;
-    prepvec        *pv_list = NULL;
+    int      retval = -1;
+    cxobj  **gvec = NULL; /* groups */
+    size_t   glen;
+    cxobj  **rlistvec = NULL; /* rule-list */
+    size_t   rlistlen;
+    cxobj  **rvec = NULL; /* rules */
+    char    *write_default = NULL;
+    cvec    *nsc = NULL;
+    int      ret;
+    prepvec *pv_list = NULL;
 
     /* Create namespace context for with nacm namespace as default */
     if ((nsc = xml_nsctx_init(NULL, NACM_NS)) == NULL)

lib/src/clixon_xml_map.c

@@ -1380,7 +1380,7 @@ xml_merge1(cxobj              *x0,  /* the target */
  * @retval     1      OK
  * @retval     0      Yang error, reason is set
  * @retval    -1      Error
- * @note both x0 and x1 need to be top-level trees
+ * @note both x0 and x1 need to be top-level trees AND bound to YANG
  */
 int
 xml_merge(cxobj     *x0,