mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-27 17:49:23 +00:00
merge bootcheck and mainline into newreloc
This commit is contained in:
commit
3c83bc50db
165 files changed
+4132
-665
No files matched your search
+1
-2
@@ -561,10 +561,9 @@ grub_xnu_register_memory (char *prefix, int *suffix,
|
||||
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can't register memory");
|
||||
if (suffix)
|
||||
{
|
||||
driverkey->name = grub_malloc (grub_strlen (prefix) + 10);
|
||||
driverkey->name = grub_xasprintf ("%s%d", prefix, (*suffix)++);
|
||||
if (!driverkey->name)
|
||||
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can't register memory");
|
||||
grub_sprintf (driverkey->name, "%s%d", prefix, (*suffix)++);
|
||||
}
|
||||
else
|
||||
driverkey->name = grub_strdup (prefix);
|
||||
|
||||
Reference in new issue
Block a user