Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 14:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

loader: Update error conditionals to use enums

Browse Source 
In grub-core/loader/i386/bsdXX.c and grub-core/loader/multiboot_elfxx.c, error
conditionals are simplified to statements such as "if (err)". Even though the
assumption that non-zero values give errors is correct, it would be clearer and
more consistent to compare these conditionals to GRUB_ERR_NONE.

Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Alec Brown authored and Daniel Kiper committed 2022-08-19 22:37:21 +02:00
1 parent 477ce46235
commit 8df6e1c067
2 files changed
+22 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/loader/i386/bsdXX.c
+19 -19
View File
@@ -94,7 +94,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
curload = module = ALIGN_PAGE (*kern_end); curload = module = ALIGN_PAGE (*kern_end);
err = read_headers (file, argv[0], &e, &shdr); err = read_headers (file, argv[0], &e, &shdr);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
err = grub_elf_get_shnum (&e, &shnum); err = grub_elf_get_shnum (&e, &shnum);
@@ -118,7 +118,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
grub_relocator_chunk_t ch; grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch, err = grub_relocator_alloc_chunk_addr (relocator, &ch,
module, chunk_size); module, chunk_size);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
chunk_src = get_virtual_current_address (ch); chunk_src = get_virtual_current_address (ch);
} }
@@ -143,7 +143,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
case SHT_PROGBITS: case SHT_PROGBITS:
err = load (file, argv[0], (grub_uint8_t *) chunk_src + curload - *kern_end, err = load (file, argv[0], (grub_uint8_t *) chunk_src + curload - *kern_end,
s->sh_offset, s->sh_size); s->sh_offset, s->sh_size);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
break; break;
case SHT_NOBITS: case SHT_NOBITS:
@@ -159,11 +159,11 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
err = grub_freebsd_add_meta_module (argv[0], FREEBSD_MODTYPE_ELF_MODULE_OBJ, err = grub_freebsd_add_meta_module (argv[0], FREEBSD_MODTYPE_ELF_MODULE_OBJ,
argc - 1, argv + 1, module, argc - 1, argv + 1, module,
curload - module); curload - module);
if (! err) if (err == GRUB_ERR_NONE)
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA
| FREEBSD_MODINFOMD_ELFHDR, | FREEBSD_MODINFOMD_ELFHDR,
&e, sizeof (e)); &e, sizeof (e));
if (! err) if (err == GRUB_ERR_NONE)
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA
| FREEBSD_MODINFOMD_SHDR, | FREEBSD_MODINFOMD_SHDR,
shdr, shnum * e.e_shentsize); shdr, shnum * e.e_shentsize);
@@ -192,7 +192,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
curload = module = ALIGN_PAGE (*kern_end); curload = module = ALIGN_PAGE (*kern_end);
err = read_headers (file, argv[0], &e, &shdr); err = read_headers (file, argv[0], &e, &shdr);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
err = grub_elf_get_shnum (&e, &shnum); err = grub_elf_get_shnum (&e, &shnum);
@@ -225,7 +225,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
err = grub_relocator_alloc_chunk_addr (relocator, &ch, err = grub_relocator_alloc_chunk_addr (relocator, &ch,
module, chunk_size); module, chunk_size);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
chunk_src = get_virtual_current_address (ch); chunk_src = get_virtual_current_address (ch);
@@ -252,7 +252,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
(grub_uint8_t *) chunk_src + module (grub_uint8_t *) chunk_src + module
+ s->sh_addr - *kern_end, + s->sh_addr - *kern_end,
s->sh_offset, s->sh_size); s->sh_offset, s->sh_size);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
break; break;
case SHT_NOBITS: case SHT_NOBITS:
@@ -285,7 +285,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
curload - module); curload - module);
out: out:
grub_free (shdr); grub_free (shdr);
if (err) if (err != GRUB_ERR_NONE)
return err; return err;
return SUFFIX (grub_freebsd_load_elf_meta) (relocator, file, argv[0], kern_end); return SUFFIX (grub_freebsd_load_elf_meta) (relocator, file, argv[0], kern_end);
} }
@@ -313,7 +313,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
grub_size_t chunk_size; grub_size_t chunk_size;
err = read_headers (file, filename, &e, &shdr); err = read_headers (file, filename, &e, &shdr);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
err = grub_elf_get_shnum (&e, &shnum); err = grub_elf_get_shnum (&e, &shnum);
@@ -323,7 +323,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA | err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
FREEBSD_MODINFOMD_ELFHDR, &e, FREEBSD_MODINFOMD_ELFHDR, &e,
sizeof (e)); sizeof (e));
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
for (s = shdr; s < (Elf_Shdr *) ((grub_uint8_t *) shdr + shnum * e.e_shentsize); for (s = shdr; s < (Elf_Shdr *) ((grub_uint8_t *) shdr + shnum * e.e_shentsize);
@@ -351,7 +351,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
grub_relocator_chunk_t ch; grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch, err = grub_relocator_alloc_chunk_addr (relocator, &ch,
symtarget, chunk_size); symtarget, chunk_size);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
sym_chunk = get_virtual_current_address (ch); sym_chunk = get_virtual_current_address (ch);
} }
@@ -414,14 +414,14 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA | err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
FREEBSD_MODINFOMD_DYNAMIC, &dynamic, FREEBSD_MODINFOMD_DYNAMIC, &dynamic,
sizeof (dynamic)); sizeof (dynamic));
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
} }
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA | err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
FREEBSD_MODINFOMD_SSYM, &symstart, FREEBSD_MODINFOMD_SSYM, &symstart,
sizeof (symstart)); sizeof (symstart));
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA | err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
@@ -429,7 +429,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
sizeof (symend)); sizeof (symend));
out: out:
grub_free (shdr); grub_free (shdr);
if (err) if (err != GRUB_ERR_NONE)
return err; return err;
*kern_end = ALIGN_PAGE (symend); *kern_end = ALIGN_PAGE (symend);
@@ -455,7 +455,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
grub_addr_t symtarget; grub_addr_t symtarget;
err = read_headers (file, filename, &e, &shdr); err = read_headers (file, filename, &e, &shdr);
if (err) if (err != GRUB_ERR_NONE)
{ {
grub_free (shdr); grub_free (shdr);
return grub_errno; return grub_errno;
@@ -492,7 +492,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
grub_relocator_chunk_t ch; grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch, err = grub_relocator_alloc_chunk_addr (relocator, &ch,
symtarget, chunk_size); symtarget, chunk_size);
if (err) if (err != GRUB_ERR_NONE)
goto out; goto out;
sym_chunk = get_virtual_current_address (ch); sym_chunk = get_virtual_current_address (ch);
} }
@@ -566,7 +566,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
sizeof (symtab)); sizeof (symtab));
out: out:
grub_free (shdr); grub_free (shdr);
if (err) if (err != GRUB_ERR_NONE)
return err; return err;
*kern_end = ALIGN_PAGE (symtarget + chunk_size); *kern_end = ALIGN_PAGE (symtarget + chunk_size);
@@ -590,7 +590,7 @@ SUFFIX(grub_openbsd_find_ramdisk) (grub_file_t file,
Elf_Shnum shnum; Elf_Shnum shnum;
err = read_headers (file, filename, &e, &shdr); err = read_headers (file, filename, &e, &shdr);
if (err) if (err != GRUB_ERR_NONE)
{ {
grub_free (shdr); grub_free (shdr);
return err; return err;
grub-core/loader/multiboot_elfxx.c
+3 -3
View File
@@ -138,7 +138,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
load_size, mld->align ? mld->align : 1, load_size, mld->align ? mld->align : 1,
mld->preference, mld->avoid_efi_boot_services); mld->preference, mld->avoid_efi_boot_services);
if (err) if (err != GRUB_ERR_NONE)
{ {
grub_dprintf ("multiboot_loader", "Cannot allocate memory for OS image\n"); grub_dprintf ("multiboot_loader", "Cannot allocate memory for OS image\n");
return err; return err;
@@ -173,7 +173,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
err = grub_relocator_alloc_chunk_addr (GRUB_MULTIBOOT (relocator), &ch, err = grub_relocator_alloc_chunk_addr (GRUB_MULTIBOOT (relocator), &ch,
phdr(i)->p_paddr, phdr(i)->p_memsz); phdr(i)->p_paddr, phdr(i)->p_memsz);
if (err) if (err != GRUB_ERR_NONE)
{ {
grub_dprintf ("multiboot_loader", "Cannot allocate memory for OS image\n"); grub_dprintf ("multiboot_loader", "Cannot allocate memory for OS image\n");
return err; return err;
@@ -284,7 +284,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
sh->sh_size, sh->sh_addralign, sh->sh_size, sh->sh_addralign,
GRUB_RELOCATOR_PREFERENCE_NONE, GRUB_RELOCATOR_PREFERENCE_NONE,
mld->avoid_efi_boot_services); mld->avoid_efi_boot_services);
if (err) if (err != GRUB_ERR_NONE)
{ {
grub_dprintf ("multiboot_loader", "Error loading shdr %d\n", i); grub_dprintf ("multiboot_loader", "Error loading shdr %d\n", i);
return err; return err;