summaryrefslogtreecommitdiffstats
path: root/src/interface/efi/efi_file.c
diff options
context:
space:
mode:
authorMichael Brown2014-07-31 13:22:40 +0200
committerMichael Brown2014-07-31 13:50:09 +0200
commit4a480f1d1565aa5972c4fc27ceec8ae4b9b1e86c (patch)
tree7d6cc53d78cc711330425810dd78320ab5aaaf81 /src/interface/efi/efi_file.c
parent[efi] Allow compiler to perform type checks on EFI_HANDLE (diff)
downloadipxe-4a480f1d1565aa5972c4fc27ceec8ae4b9b1e86c.tar.gz
ipxe-4a480f1d1565aa5972c4fc27ceec8ae4b9b1e86c.tar.xz
ipxe-4a480f1d1565aa5972c4fc27ceec8ae4b9b1e86c.zip
[efi] Avoid unnecessarily passing pointers to EFI_HANDLEs
efi_file_install() and efi_download_install() are both used to install onto existing handles. There is therefore no need to allow for each of their calls to InstallMultipleProtocolInterfaces() to create a new handle. By passing the handle directly (rather than a pointer to the handle), we avoid potential confusion (and erroneous debug message colours). Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/interface/efi/efi_file.c')
-rw-r--r--src/interface/efi/efi_file.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interface/efi/efi_file.c b/src/interface/efi/efi_file.c
index f8713750..aafc781a 100644
--- a/src/interface/efi/efi_file.c
+++ b/src/interface/efi/efi_file.c
@@ -575,7 +575,7 @@ static EFI_DISK_IO_PROTOCOL efi_disk_io_protocol = {
* @v handle EFI handle
* @ret rc Return status code
*/
-int efi_file_install ( EFI_HANDLE *handle ) {
+int efi_file_install ( EFI_HANDLE handle ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
union {
EFI_DISK_IO_PROTOCOL *diskio;
@@ -592,7 +592,7 @@ int efi_file_install ( EFI_HANDLE *handle ) {
* handle just to keep things looking normal.
*/
if ( ( efirc = bs->InstallMultipleProtocolInterfaces (
- handle,
+ &handle,
&efi_block_io_protocol_guid,
&efi_block_io_protocol,
&efi_disk_io_protocol_guid,
@@ -624,9 +624,9 @@ int efi_file_install ( EFI_HANDLE *handle ) {
* of calls to our DRIVER_STOP method when starting the EFI
* shell. I have no idea why this is.
*/
- if ( ( efirc = bs->OpenProtocol ( *handle, &efi_disk_io_protocol_guid,
+ if ( ( efirc = bs->OpenProtocol ( handle, &efi_disk_io_protocol_guid,
&diskio.interface, efi_image_handle,
- *handle,
+ handle,
EFI_OPEN_PROTOCOL_BY_DRIVER ) ) != 0){
rc = -EEFI ( efirc );
DBGC ( handle, "Could not open disk I/O protocol: %s\n",
@@ -637,11 +637,11 @@ int efi_file_install ( EFI_HANDLE *handle ) {
return 0;
- bs->CloseProtocol ( *handle, &efi_disk_io_protocol_guid,
- efi_image_handle, *handle );
+ bs->CloseProtocol ( handle, &efi_disk_io_protocol_guid,
+ efi_image_handle, handle );
err_open:
bs->UninstallMultipleProtocolInterfaces (
- *handle,
+ handle,
&efi_simple_file_system_protocol_guid,
&efi_simple_file_system_protocol,
&efi_disk_io_protocol_guid,