From 2d86cd692da48fe224fed109bd017277f004d6d7 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Sat, 15 Jan 2022 11:31:49 +0500
Subject: [PATCH] Make tag print funcs public

---
 include/kernaux/multiboot2.h  | 16 ++++++++++++++++
 src/multiboot2/header_print.c |  4 ++--
 src/multiboot2/info_print.c   | 18 ++++--------------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/include/kernaux/multiboot2.h b/include/kernaux/multiboot2.h
index 8a1f2d1..257a7ab 100644
--- a/include/kernaux/multiboot2.h
+++ b/include/kernaux/multiboot2.h
@@ -525,11 +525,13 @@ const char *KernAux_Multiboot2_Info_boot_cmd_line(
 void KernAux_Multiboot2_Header_print(
     const struct KernAux_Multiboot2_Header *multiboot2_header,
     void (*printf)(const char *format, ...)
+    __attribute__((format(printf, 1, 2)))
 );
 
 void KernAux_Multiboot2_HTagBase_print(
     const struct KernAux_Multiboot2_HTagBase *tag_base,
     void (*printf)(const char *format, ...)
+    __attribute__((format(printf, 1, 2)))
 );
 
 /*******************************
@@ -539,11 +541,25 @@ void KernAux_Multiboot2_HTagBase_print(
 void KernAux_Multiboot2_Info_print(
     const struct KernAux_Multiboot2_Info *multiboot2_info,
     void (*printf)(const char *format, ...)
+    __attribute__((format(printf, 1, 2)))
 );
 
 void KernAux_Multiboot2_ITagBase_print(
     const struct KernAux_Multiboot2_ITagBase *tag_base,
     void (*printf)(const char *format, ...)
+    __attribute__((format(printf, 1, 2)))
+);
+
+void KernAux_Multiboot2_ITag_MemoryMap_print(
+    const struct KernAux_Multiboot2_ITag_MemoryMap *tag,
+    void (*printf)(const char *format, ...)
+    __attribute__((format(printf, 1, 2)))
+);
+
+void KernAux_Multiboot2_ITag_ELFSymbols_print(
+    const struct KernAux_Multiboot2_ITag_ELFSymbols *tag,
+    void (*printf)(const char *format, ...)
+    __attribute__((format(printf, 1, 2)))
 );
 
 /*******************************
diff --git a/src/multiboot2/header_print.c b/src/multiboot2/header_print.c
index 3fd31c0..6d70b9d 100644
--- a/src/multiboot2/header_print.c
+++ b/src/multiboot2/header_print.c
@@ -9,7 +9,7 @@
 
 void KernAux_Multiboot2_Header_print(
     const struct KernAux_Multiboot2_Header *const multiboot2_header,
-    void (*const printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
+    void (*const printf)(const char *format, ...)
 ) {
     printf("Multiboot 2 header\n");
     printf("  magic: %u\n", multiboot2_header->magic);
@@ -39,7 +39,7 @@ void KernAux_Multiboot2_Header_print(
 
 void KernAux_Multiboot2_HTagBase_print(
     const struct KernAux_Multiboot2_HTagBase *const tag_base,
-    void (*const printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
+    void (*const printf)(const char *format, ...)
 ) {
     if (!KernAux_Multiboot2_HTagBase_is_valid(tag_base)) return;
 
diff --git a/src/multiboot2/info_print.c b/src/multiboot2/info_print.c
index d39325a..d356dde 100644
--- a/src/multiboot2/info_print.c
+++ b/src/multiboot2/info_print.c
@@ -7,19 +7,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-static void KernAux_Multiboot2_ITag_MemoryMap_print(
-    const struct KernAux_Multiboot2_ITag_MemoryMap *tag,
-    void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
-);
-
-static void KernAux_Multiboot2_ITag_ELFSymbols_print(
-    const struct KernAux_Multiboot2_ITag_ELFSymbols *tag,
-    void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
-);
-
 void KernAux_Multiboot2_Info_print(
     const struct KernAux_Multiboot2_Info *const multiboot2_info,
-    void (*const printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
+    void (*const printf)(const char *format, ...)
 ) {
     printf("Multiboot 2 info\n");
     printf("  size: %u\n", multiboot2_info->total_size);
@@ -43,7 +33,7 @@ void KernAux_Multiboot2_Info_print(
 
 void KernAux_Multiboot2_ITagBase_print(
     const struct KernAux_Multiboot2_ITagBase *const tag_base,
-    void (*const printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
+    void (*const printf)(const char *format, ...)
 ) {
     if (!KernAux_Multiboot2_ITagBase_is_valid(tag_base)) return;
 
@@ -231,7 +221,7 @@ void KernAux_Multiboot2_ITagBase_print(
 
 void KernAux_Multiboot2_ITag_MemoryMap_print(
     const struct KernAux_Multiboot2_ITag_MemoryMap *const tag,
-    void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
+    void (*printf)(const char *format, ...)
 ) {
     if (!KernAux_Multiboot2_ITag_MemoryMap_is_valid(tag)) {
         printf("  invalid!\n");
@@ -262,7 +252,7 @@ void KernAux_Multiboot2_ITag_MemoryMap_print(
 
 void KernAux_Multiboot2_ITag_ELFSymbols_print(
     const struct KernAux_Multiboot2_ITag_ELFSymbols *const tag,
-    void (*printf)(const char *format, ...) __attribute__((format(printf, 1, 2)))
+    void (*printf)(const char *format, ...)
 ) {
     if (!KernAux_Multiboot2_ITag_ELFSymbols_is_valid(tag)) {
         printf("  invalid!\n");