shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

boot: Switch to insertion sort

Browse Source 
We can do a little better than bubble sort without ramping up the
code complexity.
This commit is contained in:
Jan Janssen 2022-01-05 10:33:00 +01:00
parent 163d1ea5dd
commit 6893c4c553
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/boot/efi/boot.c
View File

@ -1644,12 +1644,6 @@ static INTN config_entry_compare(const ConfigEntry *a, const ConfigEntry *b) {
return 0;
}
static void config_sort_entries(Config *config) {
assert(config);
sort_pointer_array((void**) config->entries, config->entry_count, (compare_pointer_func_t) config_entry_compare);
}
static UINTN config_entry_find(Config *config, const CHAR16 *needle) {
assert(config);
@ -2345,7 +2339,7 @@ static void config_load_all_entries(
config_load_xbootldr(config, loaded_image->DeviceHandle);
/* sort entries after version number */
config_sort_entries(config);
sort_pointer_array((void **) config->entries, config->entry_count, (compare_pointer_func_t) config_entry_compare);
/* if we find some well-known loaders, add them to the end of the list */
config_entry_add_osx(config);

20
src/boot/efi/util.c
View File

@ -529,21 +529,17 @@ void sort_pointer_array(
return;
for (UINTN i = 1; i < n_members; i++) {
BOOLEAN more = FALSE;
UINTN k;
void *entry = array[i];
for (UINTN k = 0; k < n_members - i; k++) {
void *entry;
for (k = i; k > 0; k--) {
if (compare(array[k - 1], entry) <= 0)
break;
if (compare(array[k], array[k+1]) <= 0)
continue;
entry = array[k];
array[k] = array[k+1];
array[k+1] = entry;
more = TRUE;
array[k] = array[k - 1];
}
if (!more)
break;
array[k] = entry;
}
}