Skip to contentSkip to conversation

efi/libstub: Make efi_printk() input argument const char*

PATCH New Ard Biesheuvel 1 participant 1 message May 5, 2020 EFI

lore
Share & tools
lore

Ard Biesheuvel

author maintainer
#0 lore raw

PATCH 1/1 efi/libstub: Make efi_printk() input argument const char*

To help the compiler figure out that efi_printk() will not modify the string it is given, make the input argument type const char*.

While at it, simplify the implementation as well.

Suggested-by Joe Perches <[email protected]>
Signed-off-by Ard Biesheuvel <[email protected]>
---
 .../firmware/efi/libstub/efi-stub-helper.c    | 19 +++++++------------
 drivers/firmware/efi/libstub/efistub.h        |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)
drivers/firmware/efi/libstub/efi-stub-helper.c +7 -12
index 7aac89e928ec..2927f3d30344 100644
@@ -26,20 +26,15 @@ bool __pure __efi_soft_reserve_enabled(void)
 	return !efi_nosoftreserve;
 }
 
-void efi_printk(char *str)
+void efi_printk(const char *str)
 {
-	char *s8;
-
-	for (s8 = str; *s8; s8++) {
-		efi_char16_t ch[2] = { 0 };
-
-		ch[0] = *s8;
-		if (*s8 == '\n') {
-			efi_char16_t nl[2] = { '\r', 0 };
-			efi_char16_printk(nl);
-		}
+	while (*str) {
+		efi_char16_t ch[] = { *str++, L'\0' };
 
-		efi_char16_printk(ch);
+		if (ch[0] == L'\n')
+			efi_char16_printk(L"\r\n");
+		else
+			efi_char16_printk(ch);
 	}
 }
drivers/firmware/efi/libstub/efistub.h +1 -1
index 4f10a09563f3..15d0b6f3f6c6 100644
@@ -625,7 +625,7 @@ efi_status_t check_platform_features(void);
 
 void *get_efi_config_table(efi_guid_t guid);
 
-void efi_printk(char *str);
+void efi_printk(const char *str);
 
 void efi_free(unsigned long size, unsigned long addr);
Signature · 1 line
2.17.1