From 3d7b6b589877aef5c37bcfeb5118b7bd9c79f435 Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sat, 15 Jan 2022 16:17:06 +0500 Subject: [PATCH] Rename vars --- .../bootloader-multiboot2-grub/expected.txt | Bin 2151 -> 2156 bytes examples/bootloader-multiboot2-grub/main.c | 8 ++++---- .../bootloader-multiboot2-limine/expected.txt | Bin 1530 -> 1535 bytes examples/bootloader-multiboot2-limine/main.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/bootloader-multiboot2-grub/expected.txt b/examples/bootloader-multiboot2-grub/expected.txt index 5c1ba79989428d280e1488a80fadb18493f7f425..4957f09eb194c3413b2f1ec307c67e450730a8ca 100644 GIT binary patch delta 14 WcmaDZ@J3+5iOKdHtQ$|vX9oZ>;|59q delta 10 ScmaDO@LXWRiH&FHvjYGhG6iq| diff --git a/examples/bootloader-multiboot2-grub/main.c b/examples/bootloader-multiboot2-grub/main.c index a8d2656..cbc4329 100644 --- a/examples/bootloader-multiboot2-grub/main.c +++ b/examples/bootloader-multiboot2-grub/main.c @@ -12,7 +12,7 @@ extern const struct KernAux_Multiboot2_Header multiboot2_header; static void panic(const char *str); void main( - const uint32_t multiboot2_magic, + const uint32_t multiboot2_info_magic, const struct KernAux_Multiboot2_Info *const multiboot2_info ) { if (!KernAux_Multiboot2_Header_is_valid(&multiboot2_header)) { @@ -23,10 +23,10 @@ void main( KernAux_Multiboot2_Header_print(&multiboot2_header, kernaux_console_printf); - if (multiboot2_magic != KERNAUX_MULTIBOOT2_INFO_MAGIC) { - panic("Multiboot 2 magic number is invalid"); + if (multiboot2_info_magic != KERNAUX_MULTIBOOT2_INFO_MAGIC) { + panic("Multiboot 2 info magic number is invalid"); } else { - kernaux_console_printf("Multiboot 2 magic number is valid\n"); + kernaux_console_printf("Multiboot 2 info magic number is valid\n"); } if (!KernAux_Multiboot2_Info_is_valid(multiboot2_info)) { diff --git a/examples/bootloader-multiboot2-limine/expected.txt b/examples/bootloader-multiboot2-limine/expected.txt index 312e02618d575463d33ca0466aff21dd6f7df97e..c7e338a78e6b9e6d83a1b74aa618ab92000e308d 100644 GIT binary patch delta 15 Wcmeyx{hxcn36{*fwET_7jadOZM+V3M delta 10 Rcmey*{fm3TiH&ECSOFhg1swnY diff --git a/examples/bootloader-multiboot2-limine/main.c b/examples/bootloader-multiboot2-limine/main.c index a8d2656..cbc4329 100644 --- a/examples/bootloader-multiboot2-limine/main.c +++ b/examples/bootloader-multiboot2-limine/main.c @@ -12,7 +12,7 @@ extern const struct KernAux_Multiboot2_Header multiboot2_header; static void panic(const char *str); void main( - const uint32_t multiboot2_magic, + const uint32_t multiboot2_info_magic, const struct KernAux_Multiboot2_Info *const multiboot2_info ) { if (!KernAux_Multiboot2_Header_is_valid(&multiboot2_header)) { @@ -23,10 +23,10 @@ void main( KernAux_Multiboot2_Header_print(&multiboot2_header, kernaux_console_printf); - if (multiboot2_magic != KERNAUX_MULTIBOOT2_INFO_MAGIC) { - panic("Multiboot 2 magic number is invalid"); + if (multiboot2_info_magic != KERNAUX_MULTIBOOT2_INFO_MAGIC) { + panic("Multiboot 2 info magic number is invalid"); } else { - kernaux_console_printf("Multiboot 2 magic number is valid\n"); + kernaux_console_printf("Multiboot 2 info magic number is valid\n"); } if (!KernAux_Multiboot2_Info_is_valid(multiboot2_info)) {