diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:35:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:49:48 +0100 |
| commit | 77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch) | |
| tree | 755536a0ed1fb36c2899e9bff9e092c4008a25c4 /shared/nm-std-aux/c-list-util.c | |
| parent | 47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff) | |
| parent | fd80297a396cc4dd7da4da20208fb360aa369aa7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'shared/nm-std-aux/c-list-util.c')
| -rw-r--r-- | shared/nm-std-aux/c-list-util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/shared/nm-std-aux/c-list-util.c b/shared/nm-std-aux/c-list-util.c index a5837edd..d16bd6b7 100644 --- a/shared/nm-std-aux/c-list-util.c +++ b/shared/nm-std-aux/c-list-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Copyright (C) 2017 Red Hat, Inc. */ @@ -20,7 +20,7 @@ * pointer to @lst. * * The use of this function is to do a bulk update, that lets the - * list degredate by not updating the prev pointers. At the end, + * list degenerate by not updating the prev pointers. At the end, * the list can be fixed by c_list_relink(). */ void @@ -111,7 +111,8 @@ _c_list_sort(CList *ls, CListSortCmp cmp, const void *user_data) /* A simple top-down, non-recursive, stable merge-sort. * * Maybe natural merge-sort would be better, to do better for - * partially sorted lists. */ + * partially sorted lists. Doing that would be much more complicated, + * so it's not done. */ _split: stack_head[0].ls2 = _c_list_srt_split(stack_head[0].ls1); if (stack_head[0].ls2) { |