From 98eeb8f22df509b2a711de0e4a01660b6646f229 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 7 Jun 2019 11:41:11 +0200 Subject: [PATCH] AK: Rename printf.cpp to PrintfImplementation.h. --- AK/{printf.cpp => PrintfImplementation.h} | 20 +++++++------------- AK/StringBuilder.cpp | 4 ++-- Kernel/kprintf.cpp | 8 ++++---- LibC/stdio.cpp | 22 +++++++++++----------- LibCore/CIODevice.cpp | 2 +- 5 files changed, 25 insertions(+), 31 deletions(-) rename AK/{printf.cpp => PrintfImplementation.h} (95%) diff --git a/AK/printf.cpp b/AK/PrintfImplementation.h similarity index 95% rename from AK/printf.cpp rename to AK/PrintfImplementation.h index 0b5ee149ad..0088b550ce 100644 --- a/AK/printf.cpp +++ b/AK/PrintfImplementation.h @@ -1,17 +1,11 @@ -typedef unsigned char byte; -typedef unsigned short word; -typedef unsigned int dword; -typedef long long unsigned int qword; +#pragma once -[[gnu::always_inline]] inline size_t strlen(const char* str) -{ - size_t len = 0; - while (*(str++)) - ++len; - return len; -} +#include +#include -static constexpr const char* h = "0123456789abcdef"; +static constexpr const char* printf_hex_digits = "0123456789abcdef"; + +extern "C" size_t strlen(const char*); template [[gnu::always_inline]] inline int print_hex(PutChFunc putch, char*& bufptr, T number, byte fields) @@ -20,7 +14,7 @@ template byte shr_count = fields * 4; while (shr_count) { shr_count -= 4; - putch(bufptr, h[(number >> shr_count) & 0x0F]); + putch(bufptr, printf_hex_digits[(number >> shr_count) & 0x0F]); ++ret; } return ret; diff --git a/AK/StringBuilder.cpp b/AK/StringBuilder.cpp index 6f6a86de26..6ba5754c73 100644 --- a/AK/StringBuilder.cpp +++ b/AK/StringBuilder.cpp @@ -1,6 +1,6 @@ -#include "StringBuilder.h" -#include "printf.cpp" +#include #include +#include #include namespace AK { diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp index 884dfa9f39..9605d2cfec 100644 --- a/Kernel/kprintf.cpp +++ b/Kernel/kprintf.cpp @@ -1,10 +1,10 @@ -#include +#include +#include #include #include -#include #include -#include -#include +#include +#include static void console_putch(char*&, char ch) { diff --git a/LibC/stdio.cpp b/LibC/stdio.cpp index 3aae74ec52..926f67f8f3 100644 --- a/LibC/stdio.cpp +++ b/LibC/stdio.cpp @@ -1,17 +1,17 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include extern "C" { diff --git a/LibCore/CIODevice.cpp b/LibCore/CIODevice.cpp index 5171821b39..cc2599c609 100644 --- a/LibCore/CIODevice.cpp +++ b/LibCore/CIODevice.cpp @@ -1,9 +1,9 @@ +#include #include #include #include #include #include -#include CIODevice::CIODevice(CObject* parent) : CObject(parent)