EFI: some easy constification
PATCH 1/1 EFI: some easy constification
Inspired by some of Trammell's suggestions, this harvests some low hanging fruit, without needing to be concerned about the definitions of the EFI interfaces themselves.
xen/arch/arm/efi/efi-boot.h +4 -3
@@ -420,7 +420,7 @@ static void __init efi_arch_memory_setupstatic void __init efi_arch_handle_cmdline (CHAR16 *image_name,CHAR16 *cmdline_options, -char *cfgfile_options) +const char *cfgfile_options) {union string name;char *buf;
@@ -481,8 +481,9 @@ static void __init efi_arch_handle_cmdli efi_bs->FreePool (buf); } -static void __init efi_arch_handle_module (struct file *file,const CHAR16 *name, -char *options) +static void __init efi_arch_handle_module (const struct file *file, +const CHAR16 *name, +const char *options) {int node;int chosen;
xen/arch/x86/efi/efi-boot.h +4 -3
@@ -294,7 +294,7 @@ static void __init efi_arch_cfg_file_latstatic void __init efi_arch_handle_cmdline (CHAR16 *image_name,CHAR16 *cmdline_options, -char *cfgfile_options) +const char *cfgfile_options) {union string name;
@@ -635,8 +635,9 @@ static void __init efi_arch_memory_setup#undef l2_4G_offset } -static void __init efi_arch_handle_module (struct file *file,const CHAR16 *name, -char *options) +static void __init efi_arch_handle_module (const struct file *file, +const CHAR16 *name, +const char *options) {union string local_name;void *ptr;
xen/common/efi/boot.c +3 -3
@@ -119,7 +119,7 @@ static char *split_string(char *s);static CHAR16 *s2w (union string *str);static char *w2s (const union string *str);static bool read_file (EFI_FILE_HANDLE dir_handle,CHAR16 *name, -struct file *file,char *options); +struct file *file,const char *options);static size_t wstrlen (const CHAR16 * s);static int set_color (u32 mask,int bpp,u8 *pos,u8 *sz);static bool match_guid (const EFI_GUID *guid1,const EFI_GUID *guid2);
@@ -539,7 +539,7 @@ static char * __init split_string(char * }static bool __init read_file (EFI_FILE_HANDLE dir_handle,CHAR16 *name, -struct file *file,char *options) +struct file *file,const char *options) {EFI_FILE_HANDLE FileHandle =NULL ;UINT64 size;
@@ -1100,7 +1100,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYEFI_GRAPHICS_OUTPUT_PROTOCOL *gop =NULL ;union string section = {NULL }, name;bool base_video = false; -char *option_str; +const char *option_str;bool use_cfg_file;__set_bit (EFI_BOOT , &efi_flags);
Quoted 5 lines · Jan Beulich
Inspired by some of Trammell's suggestions, this harvests some low hanging fruit, without needing to be concerned about the definitions of the EFI interfaces themselves.
Signed-off-by Jan Beulich <[email protected]>
This is purely a non-functional change AFAICT?
Thanks, Roger.
Quoted 10 lines · Roger Pau Monné
Quoted 5 lines · Jan Beulich
Inspired by some of Trammell's suggestions, this harvests some low hanging fruit, without needing to be concerned about the definitions of the EFI interfaces themselves.
Signed-off-by Jan Beulich <[email protected]>This is purely a non-functional change AFAICT?
Acked-by Roger Pau Monné <[email protected]>
Indeed. Merely adding const with no other changes hardly can have any functional effect, I think. Unless it broke the build in some way, in which case I wouldn't [knowingly] have sent the patch.
Jan
Quoted 6 lines · Jan Beulich
Inspired by some of Trammell's suggestions, this harvests some low hanging fruit, without needing to be concerned about the definitions of the EFI interfaces themselves.
Signed-off-by Jan Beulich <[email protected]>
Hi Jan,
Quoted 5 lines · Jan Beulich
Inspired by some of Trammell's suggestions, this harvests some low hanging fruit, without needing to be concerned about the definitions of the EFI interfaces themselves.
Signed-off-by Jan Beulich <[email protected]>
Cheers,
Quoted 77 lines
xen/arch/arm/efi/efi-boot.h +4
-3@@ -420,7 +420,7 @@ static void __init efi_arch_memory_setupstatic void __init efi_arch_handle_cmdline (CHAR16 *image_name,CHAR16 *cmdline_options, -char *cfgfile_options) +const char *cfgfile_options) {union string name;char *buf;@@ -481,8 +481,9 @@ static void __init efi_arch_handle_cmdli efi_bs->FreePool (buf); } -static void __init efi_arch_handle_module (struct file *file,const CHAR16 *name, -char *options) +static void __init efi_arch_handle_module (const struct file *file, +const CHAR16 *name, +const char *options) {int node;int chosen;xen/arch/x86/efi/efi-boot.h +4
-3@@ -294,7 +294,7 @@ static void __init efi_arch_cfg_file_latstatic void __init efi_arch_handle_cmdline (CHAR16 *image_name,CHAR16 *cmdline_options, -char *cfgfile_options) +const char *cfgfile_options) {union string name;@@ -635,8 +635,9 @@ static void __init efi_arch_memory_setup#undef l2_4G_offset } -static void __init efi_arch_handle_module (struct file *file,const CHAR16 *name, -char *options) +static void __init efi_arch_handle_module (const struct file *file, +const CHAR16 *name, +const char *options) {union string local_name;void *ptr;xen/common/efi/boot.c +3
-3@@ -119,7 +119,7 @@ static char *split_string(char *s);static CHAR16 *s2w (union string *str);static char *w2s (const union string *str);static bool read_file (EFI_FILE_HANDLE dir_handle,CHAR16 *name, -struct file *file,char *options); +struct file *file,const char *options);static size_t wstrlen (const CHAR16 * s);static int set_color (u32 mask,int bpp,u8 *pos,u8 *sz);static bool match_guid (const EFI_GUID *guid1,const EFI_GUID *guid2);@@ -539,7 +539,7 @@ static char * __init split_string(char * }static bool __init read_file (EFI_FILE_HANDLE dir_handle,CHAR16 *name, -struct file *file,char *options) +struct file *file,const char *options) {EFI_FILE_HANDLE FileHandle =NULL ;UINT64 size;@@ -1100,7 +1100,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYEFI_GRAPHICS_OUTPUT_PROTOCOL *gop =NULL ;union string section = {NULL }, name;bool base_video = false; -char *option_str; +const char *option_str;bool use_cfg_file;__set_bit (EFI_BOOT , &efi_flags);
Signature · 1 line
Julien Grall