diff --git a/ChangeLog b/ChangeLog index b6bbcc6..e3d9e3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,7 +26,3 @@ 2022-12-05 Alex Kotov libkernaux 0.6.1 released - -2022-12-03 Alex Kotov - - * include/kernaux/assert.h: Rename to "include/kernaux/panic.h" diff --git a/Makefile.am b/Makefile.am index 43e281f..b3aea18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,10 +30,10 @@ lib_LTLIBRARIES = libkernaux.la libkernaux_la_LIBADD = libkernaux_la_SOURCES = \ + src/assert.c \ src/generic/display.c \ src/generic/malloc.c \ - src/generic/mutex.c \ - src/panic.c + src/generic/mutex.c ######## # libc # diff --git a/README.md b/README.md index d7c89d7..4c52377 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ zero). Work-in-progress APIs can change at any time. * [Example: CONTAINER\_OF](/examples/macro_container_of.c) * [Example: BITS](/examples/macro_bits.c) * [Example: STATIC\_TEST\*](/examples/macro_static_test.c) - * [Panic & assertions](/include/kernaux/panic.h) (*non-breaking since* **?.?.?**) + * [Assertions](/include/kernaux/assert.h) (*non-breaking since* **?.?.?**) * [Example: Assert](/examples/assert.c) * [Example: Panic](/examples/panic.c) * Stack trace *(planned)* @@ -110,7 +110,7 @@ zero). Work-in-progress APIs can change at any time. ### Global variables ```c -// in +// in void (*kernaux_assert_cb)(const char *file, int line, const char *msg) ``` diff --git a/configure.ac b/configure.ac index 0c13491..ff4a35c 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_CANONICAL_HOST AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SRCDIR([src/panic.c]) +AC_CONFIG_SRCDIR([src/assert.c]) AC_CONFIG_FILES([ Makefile examples/Makefile diff --git a/examples/assert.c b/examples/assert.c index ee97155..d9cdaf3 100644 --- a/examples/assert.c +++ b/examples/assert.c @@ -1,5 +1,5 @@ #define KERNAUX_DEBUG -#include +#include #include #include diff --git a/examples/main.c b/examples/main.c index d9cbc2f..f89d4a1 100644 --- a/examples/main.c +++ b/examples/main.c @@ -2,7 +2,7 @@ #include "config.h" #endif -#include +#include #include #include diff --git a/examples/panic.c b/examples/panic.c index 867579a..375e799 100644 --- a/examples/panic.c +++ b/examples/panic.c @@ -1,5 +1,5 @@ #define KERNAUX_DEBUG -#include +#include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index 4587939..7388080 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -9,6 +9,7 @@ nobase_include_HEADERS = \ kernaux/asm/riscv64.h \ kernaux/asm/x86_64.h \ kernaux/asm/x86.h \ + kernaux/assert.h \ kernaux/cmdline.h \ kernaux/elf.h \ kernaux/free_list.h \ @@ -23,7 +24,6 @@ nobase_include_HEADERS = \ kernaux/multiboot2.h \ kernaux/multiboot2/header_macro.h \ kernaux/ntoa.h \ - kernaux/panic.h \ kernaux/pfa.h \ kernaux/printf.h \ kernaux/printf_fmt.h \ diff --git a/include/kernaux.h b/include/kernaux.h index 7e90ecc..8d66bb7 100644 --- a/include/kernaux.h +++ b/include/kernaux.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -18,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/include/kernaux/panic.h b/include/kernaux/assert.h similarity index 88% rename from include/kernaux/panic.h rename to include/kernaux/assert.h index 2285966..09e0172 100644 --- a/include/kernaux/panic.h +++ b/include/kernaux/assert.h @@ -1,5 +1,5 @@ -#ifndef KERNAUX_INCLUDED_PANIC -#define KERNAUX_INCLUDED_PANIC +#ifndef KERNAUX_INCLUDED_ASSERT +#define KERNAUX_INCLUDED_ASSERT #ifdef __cplusplus extern "C" { diff --git a/src/arch/i386/idt.c b/src/arch/i386/idt.c index 9b83185..1a7d848 100644 --- a/src/arch/i386/idt.c +++ b/src/arch/i386/idt.c @@ -3,7 +3,7 @@ #endif #include -#include +#include #include diff --git a/src/panic.c b/src/assert.c similarity index 91% rename from src/panic.c rename to src/assert.c index 267b033..301e24a 100644 --- a/src/panic.c +++ b/src/assert.c @@ -2,7 +2,7 @@ #include "config.h" #endif -#include +#include #include diff --git a/src/cmdline.c b/src/cmdline.c index 95b762a..b76af7d 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -2,9 +2,9 @@ #include "config.h" #endif +#include #include #include -#include #include #include diff --git a/src/elf.c b/src/elf.c index 0ea378b..95da3cb 100644 --- a/src/elf.c +++ b/src/elf.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include bool KernAux_ELF_Header_is_valid( const struct KernAux_ELF_Header *const header diff --git a/src/free_list.c b/src/free_list.c index c556eaa..988901c 100644 --- a/src/free_list.c +++ b/src/free_list.c @@ -9,11 +9,11 @@ #include "config.h" #endif +#include #include #include #include #include -#include #include #include diff --git a/src/generic/display.c b/src/generic/display.c index f6ecf9e..36a4091 100644 --- a/src/generic/display.c +++ b/src/generic/display.c @@ -2,7 +2,7 @@ #include "config.h" #endif -#include +#include #include #include diff --git a/src/generic/malloc.c b/src/generic/malloc.c index 7f41003..7de56bf 100644 --- a/src/generic/malloc.c +++ b/src/generic/malloc.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/generic/mutex.c b/src/generic/mutex.c index 382bdac..9b5eed6 100644 --- a/src/generic/mutex.c +++ b/src/generic/mutex.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include void KernAux_Mutex_lock(const KernAux_Mutex mutex) { diff --git a/src/mbr.c b/src/mbr.c index f12c897..f9f3418 100644 --- a/src/mbr.c +++ b/src/mbr.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/memmap.c b/src/memmap.c index 75120aa..04534a9 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/multiboot2/header_helpers.c b/src/multiboot2/header_helpers.c index 0531ec8..c19559f 100644 --- a/src/multiboot2/header_helpers.c +++ b/src/multiboot2/header_helpers.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/multiboot2/header_is_valid.c b/src/multiboot2/header_is_valid.c index af24740..f192c16 100644 --- a/src/multiboot2/header_is_valid.c +++ b/src/multiboot2/header_is_valid.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/multiboot2/header_print.c b/src/multiboot2/header_print.c index e61fa83..bfe76c8 100644 --- a/src/multiboot2/header_print.c +++ b/src/multiboot2/header_print.c @@ -2,10 +2,10 @@ #include "config.h" #endif +#include #include #include #include -#include #include #include diff --git a/src/multiboot2/info_convert.c b/src/multiboot2/info_convert.c index 3c729a2..b195494 100644 --- a/src/multiboot2/info_convert.c +++ b/src/multiboot2/info_convert.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #ifdef WITH_MEMMAP #include diff --git a/src/multiboot2/info_helpers.c b/src/multiboot2/info_helpers.c index 2c43b97..a6e0b8b 100644 --- a/src/multiboot2/info_helpers.c +++ b/src/multiboot2/info_helpers.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/multiboot2/info_is_valid.c b/src/multiboot2/info_is_valid.c index 8a06c0b..a748140 100644 --- a/src/multiboot2/info_is_valid.c +++ b/src/multiboot2/info_is_valid.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/multiboot2/info_print.c b/src/multiboot2/info_print.c index 785d86a..7e9c473 100644 --- a/src/multiboot2/info_print.c +++ b/src/multiboot2/info_print.c @@ -2,9 +2,9 @@ #include "config.h" #endif +#include #include #include -#include #include #include diff --git a/src/ntoa.c b/src/ntoa.c index c02be27..561e008 100644 --- a/src/ntoa.c +++ b/src/ntoa.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include diff --git a/src/pfa.c b/src/pfa.c index 4382933..76aec89 100644 --- a/src/pfa.c +++ b/src/pfa.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/src/printf.c b/src/printf.c index c1b204b..2f05c33 100644 --- a/src/printf.c +++ b/src/printf.c @@ -13,7 +13,7 @@ #include "config.h" #endif -#include +#include #include #include diff --git a/src/printf_fmt.c b/src/printf_fmt.c index 4c91d16..ea1886e 100644 --- a/src/printf_fmt.c +++ b/src/printf_fmt.c @@ -9,7 +9,7 @@ #include "config.h" #endif -#include +#include #include #include diff --git a/src/units.c b/src/units.c index 80c4ac2..67cb8d2 100644 --- a/src/units.c +++ b/src/units.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/tests/main.c b/tests/main.c index 853807b..453b505 100644 --- a/tests/main.c +++ b/tests/main.c @@ -2,7 +2,7 @@ #include "config.h" #endif -#include +#include #include #include diff --git a/tests/test_memmap.c b/tests/test_memmap.c index b99fd7f..ff35279 100644 --- a/tests/test_memmap.c +++ b/tests/test_memmap.c @@ -4,9 +4,9 @@ #define KERNAUX_ACCESS_PRIVATE +#include #include #include -#include #include #include diff --git a/tests/test_ntoa_assert.c b/tests/test_ntoa_assert.c index 2f2b549..108467b 100644 --- a/tests/test_ntoa_assert.c +++ b/tests/test_ntoa_assert.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include diff --git a/tests/test_pfa_assert.c b/tests/test_pfa_assert.c index 4cb14f0..885217f 100644 --- a/tests/test_pfa_assert.c +++ b/tests/test_pfa_assert.c @@ -2,8 +2,8 @@ #include "config.h" #endif +#include #include -#include #include #include