d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store the number of handles we get back in efipart_nhandles rather

Browse Source 
than the number of bytes. Don't divide by the element size every time
we have to iterate. Eliminate now-unused variables.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2018-07-23 20:36:41 +00:00
parent ee4e1d5807
commit 3ef81aa0f5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336652
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stand/efi/libefi/efipart.c
View File

@ -210,7 +210,7 @@ efipart_inithandles(void)
return (efi_status_to_errno(status));
efipart_handles = hin;
efipart_nhandles = sz;
efipart_nhandles = sz / sizeof(*hin);
#ifdef EFIPART_DEBUG
printf("%s: Got %d BLOCK IO MEDIA handle(s)\n", __func__,
efipart_nhandles);
@ -246,7 +246,7 @@ efipart_floppy(EFI_DEVICE_PATH *node)
static bool
efipart_hdd(EFI_DEVICE_PATH *dp)
{
unsigned i, nin;
unsigned i;
EFI_DEVICE_PATH *devpath, *node;
EFI_BLOCK_IO *blkio;
EFI_STATUS status;
@ -264,8 +264,7 @@ efipart_hdd(EFI_DEVICE_PATH *dp)
* Test every EFI BLOCK IO handle to make sure dp is not device path
* for CD/DVD.
*/
nin = efipart_nhandles / sizeof (*efipart_handles);
for (i = 0; i < nin; i++) {
for (i = 0; i < efipart_nhandles; i++) {
devpath = efi_lookup_devpath(efipart_handles[i]);
if (devpath == NULL)
return (false);
@ -340,10 +339,9 @@ efipart_updatefd(void)
{
EFI_DEVICE_PATH *devpath, *node;
ACPI_HID_DEVICE_PATH *acpi;
int i, nin;
int i;
nin = efipart_nhandles / sizeof (*efipart_handles);
for (i = 0; i < nin; i++) {
for (i = 0; i < efipart_nhandles; i++) {
devpath = efi_lookup_devpath(efipart_handles[i]);
if (devpath == NULL)
continue;
@ -410,14 +408,13 @@ efipart_cdinfo_add(EFI_HANDLE handle, EFI_HANDLE alias,
static void
efipart_updatecd(void)
{
int i, nin;
int i;
EFI_DEVICE_PATH *devpath, *devpathcpy, *tmpdevpath, *node;
EFI_HANDLE handle;
EFI_BLOCK_IO *blkio;
EFI_STATUS status;
nin = efipart_nhandles / sizeof (*efipart_handles);
for (i = 0; i < nin; i++) {
for (i = 0; i < efipart_nhandles; i++) {
devpath = efi_lookup_devpath(efipart_handles[i]);
if (devpath == NULL)
continue;
@ -666,14 +663,13 @@ efipart_hdinfo_add_filepath(EFI_HANDLE disk_handle)
static void
efipart_updatehd(void)
{
int i, nin;
int i;
EFI_DEVICE_PATH *devpath, *devpathcpy, *tmpdevpath, *node;
EFI_HANDLE handle;
EFI_BLOCK_IO *blkio;
EFI_STATUS status;
nin = efipart_nhandles / sizeof (*efipart_handles);
for (i = 0; i < nin; i++) {
for (i = 0; i < efipart_nhandles; i++) {
devpath = efi_lookup_devpath(efipart_handles[i]);
if (devpath == NULL)
continue;