On Mon, Jan 29, 2018 at 06:57:51PM +0100, Daniel Kiper wrote: >On Mon, Jan 29, 2018 at 02:04:54PM +0000, Steve McIntyre wrote: >> >> diff --git a/grub-core/osdep/unix/platform.c >> b/grub-core/osdep/unix/platform.c >> index a3fcfcaca..fdd57a027 100644 >> --- a/grub-core/osdep/unix/platform.c >> +++ b/grub-core/osdep/unix/platform.c >> @@ -78,19 +78,20 @@ get_ofpathname (const char *dev) >> dev); >> } >> >> -static void >> +static int >> grub_install_remove_efi_entries_by_distributor (const char *efi_distributor) >> { >> int fd; >> pid_t pid = grub_util_exec_pipe ((const char * []){ "efibootmgr", NULL }, >> &fd); >> char *line = NULL; >> size_t len = 0; >> + int error = 0; > >s/error/ret/ or s/error/rc/ or s/error/rv/ here and below please... >In that order of preference...
ACK. ... >> diff --git a/include/grub/util/install.h b/include/grub/util/install.h >> index 5910b0c09..0dba8b67f 100644 >> --- a/include/grub/util/install.h >> +++ b/include/grub/util/install.h >> @@ -210,7 +210,7 @@ grub_install_create_envblk_file (const char *name); >> const char * >> grub_install_get_default_x86_platform (void); >> >> -void >> +int >> grub_install_register_efi (grub_device_t efidir_grub_dev, >> const char *efifile_path, >> const char *efi_distributor); >> diff --git a/util/grub-install.c b/util/grub-install.c >> index 5e4cdfd2b..e783824ba 100644 >> --- a/util/grub-install.c >> +++ b/util/grub-install.c >> @@ -1848,9 +1848,13 @@ main (int argc, char *argv[]) >> if (!removable && update_nvram) >> { >> /* Try to make this image bootable using the EFI Boot Manager, if >> available. */ >> - grub_install_register_efi (efidir_grub_dev, >> + int error = 0; > >I think that you do not need this initialization. ACK. Updated patch coming shortly. -- Steve McIntyre, Cambridge, UK. st...@einval.com The two hard things in computing: * naming things * cache invalidation * off-by-one errors -- Stig Sandbeck Mathisen _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel