aboutsummaryrefslogtreecommitdiff
path: root/src/lst/ft_lstsorted_merge.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-03-30 22:26:36 +0200
committerCharles <sircharlesaze@gmail.com>2020-03-30 22:26:36 +0200
commit901402c99018422c994bdb297e3ba404969c88ea (patch)
tree98602c73a00af57fb7efcb36e4e3cbae2c0ce3a8 /src/lst/ft_lstsorted_merge.c
parent40ed37c023627726a5c9c6928284e9f042dc0fa4 (diff)
downloadlibft-901402c99018422c994bdb297e3ba404969c88ea.tar.gz
libft-901402c99018422c994bdb297e3ba404969c88ea.tar.bz2
libft-901402c99018422c994bdb297e3ba404969c88ea.zip
Added documentation for ht and lst
Diffstat (limited to 'src/lst/ft_lstsorted_merge.c')
-rw-r--r--src/lst/ft_lstsorted_merge.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lst/ft_lstsorted_merge.c b/src/lst/ft_lstsorted_merge.c
index 4f5332c..0cd5721 100644
--- a/src/lst/ft_lstsorted_merge.c
+++ b/src/lst/ft_lstsorted_merge.c
@@ -12,6 +12,14 @@
#include "libft_lst.h"
+/**
+** \brief Merge sorted lists, the new list is also sorted
+** \param l1 First list
+** \param l2 Second list
+** \param cmp Comparison function, <0 if less, 0 if equal, >0 if greater
+** \return Pointer to first node of merged list
+*/
+
t_ftlst *ft_lstsorted_merge(t_ftlst *l1, t_ftlst *l2, t_ftcompar_func cmp)
{
t_ftlst *merged;
@@ -21,7 +29,7 @@ t_ftlst *ft_lstsorted_merge(t_ftlst *l1, t_ftlst *l2, t_ftcompar_func cmp)
return (l2);
if (l2 == NULL)
return (l1);
- if (cmp(l1->content, l2->content) < 0)
+ if (cmp(l1->data, l2->data) < 0)
{
merged = l1;
merged->next = ft_lstsorted_merge(l1->next, l2, cmp);