star-line

commit c8b444517b909892eb65af5dd8a87b5161bf655d
parent 56fc20939a04b6ce553dfd9dc2da0ce1dd2b3b87
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed,  4 May 2022 16:47:50 +0200

Rename sln_leaf_get_line to sln_node_get_line

Diffstat:
M
src/sln.h
 | 
4
++--
M
src/sln_tree.c
 | 
11
++++-------
M
src/test_sln_tree.c
 | 
13
+++++++------

3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/sln.h b/src/sln.h
@@ -199,9 +199,9 @@ sln_node_get_lines_count
   (const struct sln_node* node);
 
 SLN_API res_T
-sln_leaf_get_line
+sln_node_get_line
   (const struct sln_tree* tree,
-   const struct sln_node* leaf,
+   const struct sln_node* node,
    const size_t iline,
    const struct shtr_line** line);
 
diff --git a/src/sln_tree.c b/src/sln_tree.c
@@ -474,18 +474,15 @@ sln_node_get_lines_count(const struct sln_node* node)
 }
 
 res_T
-sln_leaf_get_line
+sln_node_get_line
   (const struct sln_tree* tree,
-   const struct sln_node* leaf,
+   const struct sln_node* node,
    const size_t iline,
    const struct shtr_line** line)
 {
-  if(!tree
-  || !leaf
-  || iline > sln_node_get_lines_count(leaf)
-  || !sln_node_is_leaf(leaf))
+  if(!tree || !node || iline > sln_node_get_lines_count(node))
     return RES_BAD_ARG;
 
   return shtr_lines_view_get_line
-    (tree->lines_view, leaf->range[0] + iline, line);
+    (tree->lines_view, node->range[0] + iline, line);
 }
diff --git a/src/test_sln_tree.c b/src/test_sln_tree.c
@@ -287,7 +287,7 @@ check_tree
       FOR_EACH(iline, 0, nlines) {
         const struct shtr_line* line = NULL;
         size_t found_iline = 0;
-        CHK(sln_leaf_get_line(tree, node, iline, &line) == RES_OK);
+        CHK(sln_node_get_line(tree, node, iline, &line) == RES_OK);
         found_iline = find_line(lines_list, line);
         CHK(found_iline != SIZE_MAX); /* Line is found */
 
@@ -360,12 +360,13 @@ test_tree
     node = sln_node_get_child(node, 0);
   }
   CHK(sln_node_get_lines_count(node) <= tree_args.max_nlines_per_leaf);
-  CHK(sln_leaf_get_line(NULL, node, 0, &line) == RES_BAD_ARG);
-  CHK(sln_leaf_get_line(tree, NULL, 0, &line) == RES_BAD_ARG);
-  CHK(sln_leaf_get_line(tree, node, tree_args.max_nlines_per_leaf+1, &line)
+  CHK(sln_node_get_line(NULL, node, 0, &line) == RES_BAD_ARG);
+  CHK(sln_node_get_line(tree, NULL, 0, &line) == RES_BAD_ARG);
+  CHK(sln_node_get_line(tree, node, tree_args.max_nlines_per_leaf+1, &line)
     == RES_BAD_ARG);
-  CHK(sln_leaf_get_line(tree, node, 0, NULL) == RES_BAD_ARG);
-  CHK(sln_leaf_get_line(tree, node, 0, &line) == RES_OK);
+  CHK(sln_node_get_line(tree, node, 0, NULL) == RES_BAD_ARG);
+  CHK(sln_node_get_line(tree, node, 0, &line) == RES_OK);
+  CHK(sln_node_get_line(tree, sln_tree_get_root(tree), 0, &line) == RES_OK);
 
   check_tree(tree, lines_list);