xpath CHANGE count function accepts leaf-list or nodes with list parents nodes

Author: michalvasko

src/xpath.c

@@ -3012,15 +3012,19 @@ static int
 xpath_count(struct lyxp_set **args, uint16_t UNUSED(arg_count), struct lyd_node *UNUSED(cur_node),
             struct lys_module *UNUSED(local_mod), struct lyxp_set *set, int options)
 {
-    struct lys_node *snode;
+    struct lys_node *snode, *sparent;
     int ret = EXIT_SUCCESS;
 
     if (options & LYXP_SNODE_ALL) {
         if ((args[0]->type != LYXP_SET_SNODE_SET) || !(snode = warn_get_snode_in_ctx(args[0]))) {
             LOGWRN("Argument #1 of %s not a node-set as expected.", __func__);
             ret = EXIT_FAILURE;
-        } else if (!(snode->nodetype & (LYS_LIST | LYS_LEAFLIST))) {
-            LOGWRN("Argument #1 of %s is a %s node \"%s\".", __func__, strnodetype(snode->nodetype), snode->name);
+        }
+
+        for (sparent = snode; sparent && !(sparent->nodetype & (LYS_LIST | LYS_LEAFLIST)); sparent = lys_parent(sparent));
+        if (!sparent) {
+            LOGWRN("Argument #1 of %s is a %s node \"%s\" without a list node parent.",
+                   __func__, strnodetype(snode->nodetype), snode->name);
             ret = EXIT_FAILURE;
         }
         set_snode_clear_ctx(set);