mirror of
https://github.com/tailix/libkernaux.git
synced 2025-04-07 17:32:45 -04:00
Rename Multiboot2 info print funcs
This commit is contained in:
parent
a5f4adda40
commit
aac7214863
7 changed files with 24 additions and 24 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -42,13 +42,13 @@
|
|||
/examples/printf_va
|
||||
/examples/units_human
|
||||
|
||||
/tests/multiboot2_print1
|
||||
/tests/multiboot2_print2
|
||||
/tests/multiboot2_info_print1
|
||||
/tests/multiboot2_info_print2
|
||||
/tests/test_cmdline
|
||||
/tests/test_elf
|
||||
/tests/test_itoa
|
||||
/tests/test_multiboot2_helpers
|
||||
/tests/test_multiboot2_print
|
||||
/tests/test_multiboot2_info_print
|
||||
/tests/test_multiboot2_info_validation
|
||||
/tests/test_pfa
|
||||
/tests/test_pfa_assert
|
||||
|
|
20
Makefile.am
20
Makefile.am
|
@ -58,14 +58,14 @@ if WITH_MULTIBOOT2
|
|||
libkernaux_a_SOURCES += \
|
||||
src/multiboot2/helpers.c \
|
||||
src/multiboot2/info_is_valid.c \
|
||||
src/multiboot2/print.c
|
||||
src/multiboot2/info_print.c
|
||||
TESTS += \
|
||||
tests/test_multiboot2_helpers \
|
||||
tests/test_multiboot2_print \
|
||||
tests/test_multiboot2_info_print \
|
||||
tests/test_multiboot2_info_validation
|
||||
noinst_PROGRAMS += \
|
||||
tests/multiboot2_print1 \
|
||||
tests/multiboot2_print2
|
||||
tests/multiboot2_info_print1 \
|
||||
tests/multiboot2_info_print2
|
||||
endif
|
||||
|
||||
if WITH_PFA
|
||||
|
@ -111,14 +111,14 @@ examples_units_human_SOURCES = \
|
|||
$(libkernaux_a_SOURCES) \
|
||||
examples/units_human.c
|
||||
|
||||
tests_multiboot2_print1_SOURCES = \
|
||||
tests_multiboot2_info_print1_SOURCES = \
|
||||
$(libkernaux_a_SOURCES) \
|
||||
tests/multiboot2_print1.c \
|
||||
tests/multiboot2_info_print1.c \
|
||||
tests/multiboot2_example1.h
|
||||
|
||||
tests_multiboot2_print2_SOURCES = \
|
||||
tests_multiboot2_info_print2_SOURCES = \
|
||||
$(libkernaux_a_SOURCES) \
|
||||
tests/multiboot2_print2.c \
|
||||
tests/multiboot2_info_print2.c \
|
||||
tests/multiboot2_example2.h
|
||||
|
||||
tests_test_cmdline_SOURCES = \
|
||||
|
@ -139,9 +139,9 @@ tests_test_multiboot2_helpers_SOURCES = \
|
|||
tests/multiboot2_example1.h \
|
||||
tests/multiboot2_example2.h
|
||||
|
||||
tests_test_multiboot2_print_SOURCES = \
|
||||
tests_test_multiboot2_info_print_SOURCES = \
|
||||
$(libkernaux_a_SOURCES) \
|
||||
tests/test_multiboot2_print.c
|
||||
tests/test_multiboot2_info_print.c
|
||||
|
||||
tests_test_multiboot2_info_validation_SOURCES = \
|
||||
$(libkernaux_a_SOURCES) \
|
||||
|
|
|
@ -337,9 +337,9 @@ const char *KernAux_Multiboot2_boot_cmd_line(
|
|||
const struct KernAux_Multiboot2 *multiboot2
|
||||
);
|
||||
|
||||
/*******************
|
||||
* Print functions *
|
||||
*******************/
|
||||
/*******************************
|
||||
* Information print functions *
|
||||
*******************************/
|
||||
|
||||
void KernAux_Multiboot2_print(
|
||||
const struct KernAux_Multiboot2 *multiboot2,
|
||||
|
|
|
@ -10,12 +10,12 @@ static const char *KernAux_Multiboot2_ITag_to_str(
|
|||
enum KernAux_Multiboot2_ITag tag_type
|
||||
);
|
||||
|
||||
static void KernAux_Multiboot2_Tag_MemoryMap_print(
|
||||
static void KernAux_Multiboot2_ITag_MemoryMap_print(
|
||||
const struct KernAux_Multiboot2_Tag_MemoryMap *tag,
|
||||
void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
|
||||
);
|
||||
|
||||
static void KernAux_Multiboot2_Tag_ELFSymbols_print(
|
||||
static void KernAux_Multiboot2_ITag_ELFSymbols_print(
|
||||
const struct KernAux_Multiboot2_Tag_ELFSymbols *tag,
|
||||
void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
|
||||
);
|
||||
|
@ -164,7 +164,7 @@ void KernAux_Multiboot2_ITagBase_print(
|
|||
}
|
||||
break;
|
||||
case KERNAUX_MULTIBOOT2_ITAG_MEMORY_MAP:
|
||||
KernAux_Multiboot2_Tag_MemoryMap_print(
|
||||
KernAux_Multiboot2_ITag_MemoryMap_print(
|
||||
(struct KernAux_Multiboot2_Tag_MemoryMap*)tag_base,
|
||||
printf
|
||||
);
|
||||
|
@ -195,7 +195,7 @@ void KernAux_Multiboot2_ITagBase_print(
|
|||
}
|
||||
break;
|
||||
case KERNAUX_MULTIBOOT2_ITAG_ELF_SYMBOLS:
|
||||
KernAux_Multiboot2_Tag_ELFSymbols_print(
|
||||
KernAux_Multiboot2_ITag_ELFSymbols_print(
|
||||
(struct KernAux_Multiboot2_Tag_ELFSymbols*)tag_base,
|
||||
printf
|
||||
);
|
||||
|
@ -287,7 +287,7 @@ void KernAux_Multiboot2_ITagBase_print(
|
|||
}
|
||||
}
|
||||
|
||||
void KernAux_Multiboot2_Tag_MemoryMap_print(
|
||||
void KernAux_Multiboot2_ITag_MemoryMap_print(
|
||||
const struct KernAux_Multiboot2_Tag_MemoryMap *const tag,
|
||||
void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
|
||||
) {
|
||||
|
@ -318,7 +318,7 @@ void KernAux_Multiboot2_Tag_MemoryMap_print(
|
|||
}
|
||||
}
|
||||
|
||||
void KernAux_Multiboot2_Tag_ELFSymbols_print(
|
||||
void KernAux_Multiboot2_ITag_ELFSymbols_print(
|
||||
const struct KernAux_Multiboot2_Tag_ELFSymbols *const tag,
|
||||
void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
|
||||
) {
|
|
@ -269,7 +269,7 @@ static const char output2[] =
|
|||
int main()
|
||||
{
|
||||
{
|
||||
FILE *const fd = popen("tests/multiboot2_print1", "r");
|
||||
FILE *const fd = popen("tests/multiboot2_info_print1", "r");
|
||||
assert(fd != NULL);
|
||||
|
||||
for (const char *ch = output1; *ch; ++ch) {
|
||||
|
@ -281,7 +281,7 @@ int main()
|
|||
}
|
||||
|
||||
{
|
||||
FILE *const fd = popen("tests/multiboot2_print2", "r");
|
||||
FILE *const fd = popen("tests/multiboot2_info_print2", "r");
|
||||
assert(fd != NULL);
|
||||
|
||||
for (const char *ch = output2; *ch; ++ch) {
|
Loading…
Add table
Reference in a new issue