From 6fedf65de74be835ad7b4e37972d57354fc7588f Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Thu, 29 Dec 2022 15:45:16 +0100
Subject: [PATCH] C-API: Changed type of `veclen` parameter to `size_t` in
 `xpath_vec_flag()` Rewrite of sed -e to be portable to freebsd

---
 CHANGELOG.md                    |  1 +
 apps/backend/backend_commit.c   |  3 +--
 example/main/example_backend.c  |  2 +-
 lib/clixon/clixon_xpath.h       |  2 +-
 lib/src/clixon_event.c          | 11 +++++++----
 lib/src/clixon_xml_default.c    |  1 +
 lib/src/clixon_xpath.c          | 10 ++++++----
 test/test_netconf_monitoring.sh |  7 +++++--
 8 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c6c6da5..023024ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@ Developers may need to change their code
     * Added netconf ssh subsystem
     * Renamed from `clixon` built in `docker/base`
 * C-API
+  * Changed type of `veclen` parameter to `size_t` in `xpath_vec_flag()`
   * Added `with-defaults` parameter (default 0) to `xmldb_get0()`
   * Added `sock_flags` parameter to `clixon_proc_socket()`
   
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index c1a41aea..8e9629d1 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -637,7 +637,6 @@ candidate_validate(clicon_handle h,
     goto done;
 }
 
-
 /*! Do a diff between candidate and running, then start a commit transaction
  *
  * The code reverts changes if the commit fails. But if the revert
@@ -646,7 +645,7 @@ candidate_validate(clicon_handle h,
  * @param[in]  h          Clicon handle
  * @param[in]  xe         Request: <rpc><xn></rpc>  (or NULL)
  * @param[in]  db         A candidate database, not necessarily "candidate"
- * @param[out] cbret      Return xml tree, eg <rpc-reply>..., <rpc-error.. 
+ * @param[out] cbret      Return xml tree, eg <rpc-reply>..., <rpc-error.. (if retval = 0)
  * @retval    -1          Error - or validation failed 
  * @retval     0          Validation failed (with cbret set)
  * @retval     1          Validation OK       
diff --git a/example/main/example_backend.c b/example/main/example_backend.c
index 95be0dd9..1e540305 100644
--- a/example/main/example_backend.c
+++ b/example/main/example_backend.c
@@ -200,7 +200,7 @@ main_commit(clicon_handle    h,
     cxobj  *target = transaction_target(td); /* wanted XML tree */
     cxobj **vec = NULL;
     int     i;
-    int     len;
+    size_t  len;
     cvec   *nsc = NULL;
 
     if (_transaction_log)
diff --git a/lib/clixon/clixon_xpath.h b/lib/clixon/clixon_xpath.h
index 59eb98be..b615e71f 100644
--- a/lib/clixon/clixon_xpath.h
+++ b/lib/clixon/clixon_xpath.h
@@ -137,7 +137,7 @@ int   xpath_vec_ctx(cxobj *xcur, cvec *nsc, const char *xpath, int localonly, xp
 
 int    xpath_vec_bool(cxobj *xcur, cvec *nsc, const char *xpformat, ...) __attribute__ ((format (printf, 3, 4)));
 int    xpath_vec_flag(cxobj *xcur, cvec *nsc, const char *xpformat, uint16_t flags, 
-                   cxobj ***vec, int *veclen, ...) __attribute__ ((format (printf, 3, 7)));
+                   cxobj ***vec, size_t *veclen, ...) __attribute__ ((format (printf, 3, 7)));
 
 /* Functions with explicit namespace context (nsc) set. If you do not need 
  * explicit namespace contexts (most do not) consider using the API functions
diff --git a/lib/src/clixon_event.c b/lib/src/clixon_event.c
index 4bad456c..252ca734 100644
--- a/lib/src/clixon_event.c
+++ b/lib/src/clixon_event.c
@@ -332,10 +332,13 @@ clixon_event_poll(int fd)
 }
 
 /*! Dispatch file descriptor events (and timeouts) by invoking callbacks.
- * There is an issue with fairness that timeouts may take over all events
- * One could try to poll the file descriptors after a timeout?
- * @retval  0  OK
- * @retval -1  Error: eg select, callback, timer, 
+ *
+ * @param[in] h  Clixon handle
+ * @retval    0  OK
+ * @retval   -1  Error: eg select, callback, timer, 
+ * @note There is an issue with fairness between timeouts and events
+ *       Currently a socket that is not read/emptied properly starve timeouts.
+ *       One could try to poll the file descriptors after a timeout?
  */
 int
 clixon_event_loop(clicon_handle h)
diff --git a/lib/src/clixon_xml_default.c b/lib/src/clixon_xml_default.c
index a0e08029..c9574de2 100644
--- a/lib/src/clixon_xml_default.c
+++ b/lib/src/clixon_xml_default.c
@@ -370,6 +370,7 @@ xml_default(yang_stmt *yt,
             case Y_CHOICE:{
                 if (xml_default_choice(yc, xt, state) < 0)
                     goto done;
+                break;
             }
             default:
                 break;
diff --git a/lib/src/clixon_xpath.c b/lib/src/clixon_xpath.c
index fb820df0..f9ce9834 100644
--- a/lib/src/clixon_xpath.c
+++ b/lib/src/clixon_xpath.c
@@ -823,7 +823,7 @@ xpath_vec(cxobj      *xcur,
  * @retval     -1       error.
  * @code
  *   cxobj **vec;
- *   int     veclen;
+ *   size_t  veclen;
  *   cvec   *nsc; // namespace context (not NULL)
  *   if (xpath_vec_flag(xcur, nsc, "//symbol/foo", XML_FLAG_ADD, &vec, &veclen) < 0) 
  *      goto err;
@@ -842,7 +842,7 @@ xpath_vec_flag(cxobj      *xcur,
                const char *xpformat, 
                uint16_t    flags,
                cxobj    ***vec, 
-               int        *veclen,
+               size_t     *veclen,
                ...)
 {
     int        retval = -1;
@@ -852,6 +852,7 @@ xpath_vec_flag(cxobj      *xcur,
     xp_ctx    *xr = NULL;
     int        i;
     cxobj     *x;
+    int        ilen = 0; /* change when cxvec_append uses size_t */
     
     va_start(ap, veclen);    
     len = vsnprintf(NULL, 0, xpformat, ap);
@@ -870,17 +871,18 @@ xpath_vec_flag(cxobj      *xcur,
     }
     va_end(ap);
     *vec=NULL;
-    *veclen = 0;
     if (xpath_vec_ctx(xcur, nsc, xpath, 0, &xr) < 0)
         goto done;
     if (xr && xr->xc_type == XT_NODESET){
         for (i=0; i<xr->xc_size; i++){
+            int ilen;
             x = xr->xc_nodeset[i];
             if (flags==0x0 || xml_flag(x, flags))
-                if (cxvec_append(x, vec, veclen) < 0)
+                if (cxvec_append(x, vec, &ilen) < 0)
                     goto done;          
         }
     }
+    *veclen = ilen;
     retval = 0;
  done:
     if (xr)
diff --git a/test/test_netconf_monitoring.sh b/test/test_netconf_monitoring.sh
index 2455ce40..fa1c3afa 100755
--- a/test/test_netconf_monitoring.sh
+++ b/test/test_netconf_monitoring.sh
@@ -171,9 +171,12 @@ EOF
         continue
     fi
     # Mask netconf header and footer
-    sed -i -e "s/<rpc-reply $DEFAULTNS><data xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">//" -e 's/<\/data><\/rpc-reply>]]>]]>//' /var/tmp/test_netconf_monitoring.sh/ex.yang
+    sed -i -e "s/<rpc-reply $DEFAULTNS><data xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">//" /var/tmp/test_netconf_monitoring.sh/ex.yang
+    sed -i -e 's/<\/data><\/rpc-reply>]]>]]>//' /var/tmp/test_netconf_monitoring.sh/ex.yang
     # Decode XML
-    sed -i -e 's/&gt;/>/g' -e 's/&lt;/</g' -e 's/\&amp;/\&/g' /var/tmp/test_netconf_monitoring.sh/ex.yang
+    sed -i -e 's/&gt;/>/g' /var/tmp/test_netconf_monitoring.sh/ex.yang
+    sed -i -e 's/&lt;/</g' /var/tmp/test_netconf_monitoring.sh/ex.yang
+    sed -i -e 's/\&amp;/\&/g' /var/tmp/test_netconf_monitoring.sh/ex.yang
     new "get-schema check yang $b"
     diff $dir/ex.yang $f
     if [ $? -ne 0 ]; then