add grub_qsort_strcmp to use when sorting array of strings
Compare function used in qsort gets arguments by reference, so strcmp cannot be used directly - it expects pointer to char, but gets pointer to pointer to char. Introduce new helper grub_qsort_strcmp and use it in grub-install. This helper is going to be used in a couple more places as well so add it to global file, not in grub-install.c.
This commit is contained in:
parent
ad73cc3312
commit
3100cdc7f9
4 changed files with 18 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com>
|
||||||
|
|
||||||
|
* util/misc.c (grub_qsort_strcmp): Add qsort helper function to sort
|
||||||
|
strings.
|
||||||
|
* include/grub/util/misc.h: Define it ...
|
||||||
|
* util/grub-install.c (device_map_check_duplicates): ... and use it.
|
||||||
|
|
||||||
2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com>
|
2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com>
|
||||||
|
|
||||||
* util/grub.d/30_os-prober.in: Fix use of grub-probe instead of
|
* util/grub.d/30_os-prober.in: Fix use of grub-probe instead of
|
||||||
|
|
|
@ -47,4 +47,6 @@ void grub_util_init_nls (void);
|
||||||
|
|
||||||
void grub_util_host_init (int *argc, char ***argv);
|
void grub_util_host_init (int *argc, char ***argv);
|
||||||
|
|
||||||
|
int grub_qsort_strcmp (const void *, const void *);
|
||||||
|
|
||||||
#endif /* ! GRUB_UTIL_MISC_HEADER */
|
#endif /* ! GRUB_UTIL_MISC_HEADER */
|
||||||
|
|
|
@ -586,7 +586,7 @@ device_map_check_duplicates (const char *dev_map)
|
||||||
|
|
||||||
fclose (fp);
|
fclose (fp);
|
||||||
|
|
||||||
qsort (d, filled, sizeof (d[0]), (int (*) (const void *, const void *))strcmp);
|
qsort (d, filled, sizeof (d[0]), grub_qsort_strcmp);
|
||||||
|
|
||||||
for (i = 0; i + 1 < filled; i++)
|
for (i = 0; i + 1 < filled; i++)
|
||||||
if (strcmp (d[i], d[i+1]) == 0)
|
if (strcmp (d[i], d[i+1]) == 0)
|
||||||
|
|
|
@ -256,3 +256,11 @@ void
|
||||||
grub_register_exported_symbols (void)
|
grub_register_exported_symbols (void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Used in comparison of arrays of strings with qsort */
|
||||||
|
int
|
||||||
|
grub_qsort_strcmp (const void *p1, const void *p2)
|
||||||
|
{
|
||||||
|
return strcmp(*(char **)p1, *(char **)p2);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue