diff options
| author | Charles <sircharlesaze@gmail.com> | 2019-11-23 00:28:03 +0100 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2019-11-23 00:28:03 +0100 |
| commit | c90117251f11e03452ae9808ff8626016c7958a1 (patch) | |
| tree | b4ef9f0f562d3394e23af4a698ad35964f18bc23 /ft_list_sort.s | |
| parent | 8e3a5ac569a3ccc1101b58fe8ef673f02b4961fb (diff) | |
| download | libasm-c90117251f11e03452ae9808ff8626016c7958a1.tar.gz libasm-c90117251f11e03452ae9808ff8626016c7958a1.tar.bz2 libasm-c90117251f11e03452ae9808ff8626016c7958a1.zip | |
Compiling with nasm
Diffstat (limited to 'ft_list_sort.s')
| -rw-r--r-- | ft_list_sort.s | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/ft_list_sort.s b/ft_list_sort.s index dc16183..1ab5485 100644 --- a/ft_list_sort.s +++ b/ft_list_sort.s @@ -6,7 +6,7 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/11/22 21:03:52 by cacharle #+# #+# # -# Updated: 2019/11/22 21:17:36 by cacharle ### ########.fr # +# Updated: 2019/11/22 21:27:27 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -32,5 +32,20 @@ _ft_list_sort: merge_sorted: - - +#ListNode* mergeTwoLists(ListNode* l1, ListNode* l2) +#{ +# ListNode *merged = NULL; +# +# if (l1 == NULL && l2 == NULL) +# return NULL; +# if (l1 == NULL) +# return l2; +# if (l2 == NULL) +# return l1; +# merged = l1->val < l2->val ? l1 : l2; +# if (l1->val < l2->val) +# merged->next = mergeTwoLists(l1->next, l2); +# else +# merged->next = mergeTwoLists(l1, l2->next); +# return merged; +#} |