From b035795eb3f5f42be2b2ee88b73ee9204732132d Mon Sep 17 00:00:00 2001 From: apio Date: Wed, 19 Oct 2022 17:41:23 +0200 Subject: [PATCH] Kernel: Move errno.h and (k)assert.h out of the main include directory This is mostly so IDEs don't pick them up instead of the userspace headers :) --- kernel/include/{kassert.h => std/assert.h} | 0 kernel/include/{ => std}/errno.h | 0 kernel/src/fs/FileDescriptor.cpp | 2 +- kernel/src/fs/VFS.cpp | 2 +- kernel/src/gdt/GDT.cpp | 2 +- kernel/src/init/Init.cpp | 2 +- kernel/src/init/InitRD.cpp | 2 +- kernel/src/interrupts/Entry.cpp | 2 +- kernel/src/interrupts/IDT.cpp | 2 +- kernel/src/main.cpp | 2 +- kernel/src/memory/MemoryManager.cpp | 2 +- kernel/src/memory/PMM.cpp | 2 +- kernel/src/memory/VMM.cpp | 2 +- kernel/src/rand/Mersenne.cpp | 2 +- kernel/src/sys/Syscall.cpp | 2 +- kernel/src/sys/elf/ELFLoader.cpp | 4 ++-- kernel/src/sys/exec.cpp | 4 ++-- kernel/src/sys/id.cpp | 2 +- kernel/src/sys/mem.cpp | 2 +- kernel/src/sys/paint.cpp | 2 +- kernel/src/sys/sched.cpp | 2 +- kernel/src/sys/stdio.cpp | 2 +- kernel/src/thread/Scheduler.cpp | 4 ++-- libs/libc/src/file.cpp | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) rename kernel/include/{kassert.h => std/assert.h} (100%) rename kernel/include/{ => std}/errno.h (100%) diff --git a/kernel/include/kassert.h b/kernel/include/std/assert.h similarity index 100% rename from kernel/include/kassert.h rename to kernel/include/std/assert.h diff --git a/kernel/include/errno.h b/kernel/include/std/errno.h similarity index 100% rename from kernel/include/errno.h rename to kernel/include/std/errno.h diff --git a/kernel/src/fs/FileDescriptor.cpp b/kernel/src/fs/FileDescriptor.cpp index eb4e2da9..c98e4f8e 100644 --- a/kernel/src/fs/FileDescriptor.cpp +++ b/kernel/src/fs/FileDescriptor.cpp @@ -1,5 +1,5 @@ #include "fs/FileDescriptor.h" -#include "errno.h" +#include "std/errno.h" Descriptor::Descriptor() : m_is_open(false) { diff --git a/kernel/src/fs/VFS.cpp b/kernel/src/fs/VFS.cpp index f2c175c6..0c4647a3 100644 --- a/kernel/src/fs/VFS.cpp +++ b/kernel/src/fs/VFS.cpp @@ -1,8 +1,8 @@ #define MODULE "vfs" #include "fs/VFS.h" -#include "errno.h" #include "log/Log.h" +#include "std/errno.h" #include "std/libgen.h" #include "std/stdlib.h" #include "std/string.h" diff --git a/kernel/src/gdt/GDT.cpp b/kernel/src/gdt/GDT.cpp index d6b5e48c..7d47da61 100644 --- a/kernel/src/gdt/GDT.cpp +++ b/kernel/src/gdt/GDT.cpp @@ -1,9 +1,9 @@ #define MODULE "gdt" #include "gdt/GDT.h" -#include "kassert.h" #include "log/Log.h" #include "memory/MemoryManager.h" +#include "std/assert.h" #include "std/string.h" #include diff --git a/kernel/src/init/Init.cpp b/kernel/src/init/Init.cpp index c2653599..09cebe09 100644 --- a/kernel/src/init/Init.cpp +++ b/kernel/src/init/Init.cpp @@ -6,7 +6,6 @@ #include "init/InitRD.h" #include "interrupts/Interrupts.h" #include "io/Serial.h" -#include "kassert.h" #include "log/Log.h" #include "memory/MemoryManager.h" #include "memory/PMM.h" @@ -16,6 +15,7 @@ #include "rand/Mersenne.h" #include "render/Framebuffer.h" #include "render/TextRenderer.h" +#include "std/assert.h" #include "std/string.h" extern BOOTBOOT bootboot; diff --git a/kernel/src/init/InitRD.cpp b/kernel/src/init/InitRD.cpp index 45d58892..9863b31b 100644 --- a/kernel/src/init/InitRD.cpp +++ b/kernel/src/init/InitRD.cpp @@ -2,12 +2,12 @@ #include "init/InitRD.h" #include "bootboot.h" -#include "errno.h" #include "fs/VFS.h" #include "io/Serial.h" #include "log/Log.h" #include "memory/MemoryManager.h" #include "misc/utils.h" +#include "std/errno.h" #include "std/stdlib.h" #include "std/string.h" diff --git a/kernel/src/interrupts/Entry.cpp b/kernel/src/interrupts/Entry.cpp index 1496bab7..a08445a3 100644 --- a/kernel/src/interrupts/Entry.cpp +++ b/kernel/src/interrupts/Entry.cpp @@ -4,10 +4,10 @@ #include "interrupts/IRQ.h" #include "interrupts/Interrupts.h" #include "io/Serial.h" -#include "kassert.h" #include "log/Log.h" #include "misc/hang.h" #include "panic/Panic.h" +#include "std/assert.h" #include "std/stdio.h" #include "sys/Syscall.h" #include "thread/Scheduler.h" diff --git a/kernel/src/interrupts/IDT.cpp b/kernel/src/interrupts/IDT.cpp index 32753619..38a1e79d 100644 --- a/kernel/src/interrupts/IDT.cpp +++ b/kernel/src/interrupts/IDT.cpp @@ -1,8 +1,8 @@ #define MODULE "idt" #include "interrupts/IDT.h" -#include "kassert.h" #include "log/Log.h" +#include "std/assert.h" struct IDTEntry { diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp index 05a45486..c0a031c9 100644 --- a/kernel/src/main.cpp +++ b/kernel/src/main.cpp @@ -9,11 +9,11 @@ #include "interrupts/Install.h" #include "interrupts/Interrupts.h" #include "io/PIC.h" -#include "kassert.h" #include "log/Log.h" #include "memory/Memory.h" #include "memory/MemoryMap.h" #include "misc/hang.h" +#include "std/assert.h" #include "std/stdlib.h" #include "thread/PIT.h" #include "thread/Scheduler.h" diff --git a/kernel/src/memory/MemoryManager.cpp b/kernel/src/memory/MemoryManager.cpp index 3b5a11f7..afb221b3 100644 --- a/kernel/src/memory/MemoryManager.cpp +++ b/kernel/src/memory/MemoryManager.cpp @@ -3,11 +3,11 @@ #include "log/Log.h" #endif -#include "kassert.h" #include "memory/KernelHeap.h" #include "memory/MemoryManager.h" #include "memory/PMM.h" #include "memory/VMM.h" +#include "std/assert.h" void MemoryManager::init() { diff --git a/kernel/src/memory/PMM.cpp b/kernel/src/memory/PMM.cpp index f4f11a75..3f9d8dd9 100644 --- a/kernel/src/memory/PMM.cpp +++ b/kernel/src/memory/PMM.cpp @@ -2,10 +2,10 @@ #include "memory/PMM.h" #include "bootboot.h" -#include "kassert.h" #include "memory/Memory.h" #include "memory/MemoryManager.h" #include "misc/utils.h" +#include "std/assert.h" #include "std/string.h" extern BOOTBOOT bootboot; diff --git a/kernel/src/memory/VMM.cpp b/kernel/src/memory/VMM.cpp index 605c17e2..9f7a5fca 100644 --- a/kernel/src/memory/VMM.cpp +++ b/kernel/src/memory/VMM.cpp @@ -1,10 +1,10 @@ #define MODULE "vmm" #include "memory/VMM.h" -#include "kassert.h" #include "log/Log.h" #include "memory/PMM.h" #include "misc/utils.h" +#include "std/assert.h" #include "std/string.h" #include "utils/Addresses.h" #include "utils/Registers.h" diff --git a/kernel/src/rand/Mersenne.cpp b/kernel/src/rand/Mersenne.cpp index d02665cf..53a887cb 100644 --- a/kernel/src/rand/Mersenne.cpp +++ b/kernel/src/rand/Mersenne.cpp @@ -1,7 +1,7 @@ #define MODULE "rand" #include "rand/Mersenne.h" -#include "kassert.h" +#include "std/assert.h" #include typedef uint64_t word_t; diff --git a/kernel/src/sys/Syscall.cpp b/kernel/src/sys/Syscall.cpp index f813bd1b..5c788683 100644 --- a/kernel/src/sys/Syscall.cpp +++ b/kernel/src/sys/Syscall.cpp @@ -1,7 +1,7 @@ #include "sys/Syscall.h" -#include "errno.h" #include "io/Serial.h" #include "memory/VMM.h" +#include "std/errno.h" #include "std/string.h" #include "thread/Scheduler.h" diff --git a/kernel/src/sys/elf/ELFLoader.cpp b/kernel/src/sys/elf/ELFLoader.cpp index 24ca582a..02cda298 100644 --- a/kernel/src/sys/elf/ELFLoader.cpp +++ b/kernel/src/sys/elf/ELFLoader.cpp @@ -1,15 +1,15 @@ #define MODULE "elf" #include "sys/elf/ELFLoader.h" -#include "errno.h" #include "fs/VFS.h" #include "init/InitRD.h" -#include "kassert.h" #include "log/Log.h" #include "memory/Memory.h" #include "memory/MemoryManager.h" #include "memory/VMM.h" #include "misc/utils.h" +#include "std/assert.h" +#include "std/errno.h" #include "std/stdlib.h" #include "std/string.h" #include "sys/elf/ELF.h" diff --git a/kernel/src/sys/exec.cpp b/kernel/src/sys/exec.cpp index f0cfedcb..d9fa8266 100644 --- a/kernel/src/sys/exec.cpp +++ b/kernel/src/sys/exec.cpp @@ -1,12 +1,12 @@ #define MODULE "exec" -#include "errno.h" #include "interrupts/Interrupts.h" -#include "kassert.h" #include "log/Log.h" #include "memory/MemoryManager.h" #include "memory/PMM.h" #include "memory/VMM.h" +#include "std/assert.h" +#include "std/errno.h" #include "std/stdlib.h" #include "std/string.h" #include "sys/Syscall.h" diff --git a/kernel/src/sys/id.cpp b/kernel/src/sys/id.cpp index c54c742d..2e097118 100644 --- a/kernel/src/sys/id.cpp +++ b/kernel/src/sys/id.cpp @@ -1,4 +1,4 @@ -#include "errno.h" +#include "std/errno.h" #include "thread/Scheduler.h" #define ID_PID 0 diff --git a/kernel/src/sys/mem.cpp b/kernel/src/sys/mem.cpp index 50018740..aa51f14a 100644 --- a/kernel/src/sys/mem.cpp +++ b/kernel/src/sys/mem.cpp @@ -1,12 +1,12 @@ #define MODULE "mem" -#include "errno.h" #include "interrupts/Context.h" #include "log/Log.h" #include "memory/Memory.h" #include "memory/MemoryManager.h" #include "memory/VMM.h" #include "misc/utils.h" +#include "std/errno.h" #include "thread/Scheduler.h" #include diff --git a/kernel/src/sys/paint.cpp b/kernel/src/sys/paint.cpp index daece6cd..18e462c1 100644 --- a/kernel/src/sys/paint.cpp +++ b/kernel/src/sys/paint.cpp @@ -1,7 +1,7 @@ #include "bootboot.h" -#include "errno.h" #include "interrupts/Context.h" #include "render/Framebuffer.h" +#include "std/errno.h" #include extern BOOTBOOT bootboot; diff --git a/kernel/src/sys/sched.cpp b/kernel/src/sys/sched.cpp index 2e197b01..6112d3c9 100644 --- a/kernel/src/sys/sched.cpp +++ b/kernel/src/sys/sched.cpp @@ -1,5 +1,5 @@ -#include "errno.h" #include "memory/VMM.h" +#include "std/errno.h" #include "sys/UserMemory.h" #include "thread/Scheduler.h" diff --git a/kernel/src/sys/stdio.cpp b/kernel/src/sys/stdio.cpp index d9c22625..f63ef2a9 100644 --- a/kernel/src/sys/stdio.cpp +++ b/kernel/src/sys/stdio.cpp @@ -1,11 +1,11 @@ #define MODULE "stdio" -#include "errno.h" #include "interrupts/Context.h" #include "io/Serial.h" #include "log/Log.h" #include "memory/VMM.h" #include "render/TextRenderer.h" +#include "std/errno.h" #include "std/stdlib.h" #include "sys/Syscall.h" #include "sys/UserMemory.h" diff --git a/kernel/src/thread/Scheduler.cpp b/kernel/src/thread/Scheduler.cpp index a2f1eb02..d434fa1c 100644 --- a/kernel/src/thread/Scheduler.cpp +++ b/kernel/src/thread/Scheduler.cpp @@ -1,9 +1,7 @@ #define MODULE "sched" #include "thread/Scheduler.h" -#include "errno.h" #include "interrupts/Interrupts.h" -#include "kassert.h" #include "log/Log.h" #include "memory/MemoryManager.h" #include "memory/PMM.h" @@ -11,6 +9,8 @@ #include "misc/hang.h" #include "misc/utils.h" #include "panic/Panic.h" +#include "std/assert.h" +#include "std/errno.h" #include "std/stdlib.h" #include "std/string.h" #include "sys/UserMemory.h" diff --git a/libs/libc/src/file.cpp b/libs/libc/src/file.cpp index 6dc51cfa..d56084e6 100644 --- a/libs/libc/src/file.cpp +++ b/libs/libc/src/file.cpp @@ -51,7 +51,7 @@ extern "C" return stream; } - FILE* freopen(const char* pathname, const char* mode, + FILE* freopen(const char* pathname, const char*, FILE* stream) // FIXME: If pathname is NULL, open the original file with the new mode. { int fd = open(pathname, O_RDWR); // FIXME: Use the mode string.