From bfaaa24357a8bd3dec32596b7a53408f655ffceb Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sun, 3 Jan 2021 23:34:57 +0000 Subject: [PATCH] Move tests and headers and add doxygen support --- CMakeLists.txt | 65 ++++++++++++------- src/assemblers.c | 15 ++--- src/capabilities.c | 2 +- src/commands.c | 2 +- src/converters.c | 6 +- src/memory.c | 2 +- src/{tokenizers.h => private/mappings.h} | 26 +++----- src/{ => private}/memory.h | 0 src/{ => private}/string.h | 0 src/{ => public}/assemblers.h | 0 src/{ => public}/capabilities.h | 28 ++++++++- src/{ => public}/commands.h | 0 src/{ => public}/converters.h | 0 src/{ => public}/errors.h | 0 src/{ => public}/modes.h | 0 src/{ => public}/replies.h | 0 src/{ => public}/tags.h | 9 --- src/public/tokenizers.h | 79 ++++++++++++++++++++++++ src/{ => public}/types.h | 2 + src/{ => public}/uirc.h | 0 src/{ => public}/validators.h | 0 src/string.c | 2 +- src/tags.c | 2 +- {tests => src/tests}/capbitmask.c | 2 +- {tests => src/tests}/junk.c | 4 +- {tests => src/tests}/msgassm.c | 6 +- {tests => src/tests}/notrail.c | 4 +- {tests => src/tests}/numericmds.c | 6 +- {tests => src/tests}/overflow.c | 6 +- {tests => src/tests}/prefixassm.c | 4 +- {tests => src/tests}/spacedargs.c | 6 +- {tests => src/tests}/strtokmr.c | 2 +- {tests => src/tests}/tagassm.c | 4 +- {tests => src/tests}/tagtok.c | 4 +- {tests => src/tests}/timestamp.c | 4 +- {tests => src/tests}/tokenizer.c | 4 +- src/tokenizers.c | 15 ++--- src/validators.c | 6 +- 38 files changed, 216 insertions(+), 101 deletions(-) rename src/{tokenizers.h => private/mappings.h} (60%) rename src/{ => private}/memory.h (100%) rename src/{ => private}/string.h (100%) rename src/{ => public}/assemblers.h (100%) rename src/{ => public}/capabilities.h (68%) rename src/{ => public}/commands.h (100%) rename src/{ => public}/converters.h (100%) rename src/{ => public}/errors.h (100%) rename src/{ => public}/modes.h (100%) rename src/{ => public}/replies.h (100%) rename src/{ => public}/tags.h (87%) create mode 100644 src/public/tokenizers.h rename src/{ => public}/types.h (99%) rename src/{ => public}/uirc.h (100%) rename src/{ => public}/validators.h (100%) rename {tests => src/tests}/capbitmask.c (97%) rename {tests => src/tests}/junk.c (95%) rename {tests => src/tests}/msgassm.c (94%) rename {tests => src/tests}/notrail.c (94%) rename {tests => src/tests}/numericmds.c (93%) rename {tests => src/tests}/overflow.c (95%) rename {tests => src/tests}/prefixassm.c (95%) rename {tests => src/tests}/spacedargs.c (94%) rename {tests => src/tests}/strtokmr.c (98%) rename {tests => src/tests}/tagassm.c (95%) rename {tests => src/tests}/tagtok.c (95%) rename {tests => src/tests}/timestamp.c (94%) rename {tests => src/tests}/tokenizer.c (96%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75dd988..54cb885 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,23 @@ cmake_minimum_required(VERSION 3.16) -project(microirc LANGUAGES C) +project( + uIRC + VERSION 2021.01.03 + DESCRIPTION "Simple and lightweight IRC protocol helper" + LANGUAGES C +) include(GNUInstallDirs) -set(UIRC_VERSION "2021.01.03") +set(UIRC_VERSION "${PROJECT_VERSION}") add_compile_definitions(UIRC_VERSION="${UIRC_VERSION}") -OPTION(BUILD_HELPERS "Build message helpers" ON ) -OPTION(BUILD_VALIDATORS "Build message validators" ON ) -OPTION(BUILD_IRCV3 "Build IRCv3 components" ON ) -OPTION(BUILD_TESTS "Build tests for ctest" OFF) -OPTION(CODE_ANALYZER "Analyze the code statically" OFF) -OPTION(CODE_COVERAGE "Build with coverage tools" OFF) +OPTION(BUILD_HELPERS "Build message helpers" ON ) +OPTION(BUILD_VALIDATORS "Build message validators" ON ) +OPTION(BUILD_IRCV3 "Build IRCv3 components" ON ) +OPTION(BUILD_TESTS "Build tests for ctest" OFF) +OPTION(BUILD_DOCS "Build documentation with doxygen" OFF) +OPTION(CODE_ANALYZER "Analyze the code statically" OFF) +OPTION(CODE_COVERAGE "Build with coverage tools" OFF) set(UIRC_SOURCE src/assemblers.c @@ -23,15 +29,15 @@ set(UIRC_SOURCE ) set(UIRC_HEADERS - src/assemblers.h - src/commands.h - src/converters.h - src/errors.h - src/modes.h - src/replies.h - src/tokenizers.h - src/types.h - src/uirc.h + src/public/assemblers.h + src/public/commands.h + src/public/converters.h + src/public/errors.h + src/public/modes.h + src/public/replies.h + src/public/tokenizers.h + src/public/types.h + src/public/uirc.h ) # @@ -45,8 +51,8 @@ if (BUILD_IRCV3) src/capabilities.c ) set(UIRC_HEADERS ${UIRC_HEADERS} - src/tags.h - src/capabilities.h + src/public/tags.h + src/public/capabilities.h ) endif() if (BUILD_VALIDATORS) @@ -56,7 +62,7 @@ if (BUILD_VALIDATORS) src/validators.c ) set(UIRC_HEADERS ${UIRC_HEADERS} - src/validators.h + src/public/validators.h ) endif() if (BUILD_HELPERS) @@ -68,7 +74,7 @@ if (BUILD_TESTS) enable_testing() macro(buildtest name source) - add_executable(${source} tests/${source}.c) + add_executable(${source} src/tests/${source}.c) target_link_libraries(${source} uirc) add_test(NAME ${name} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source}) endmacro() @@ -92,11 +98,24 @@ if (BUILD_TESTS) endif() endif() endif() +if(BUILD_DOCS) + find_package(Doxygen REQUIRED) + if (DOXYGEN_FOUND) + set(DOXYGEN_SOURCE_BROWSER YES) + set(DOXYGEN_EXTRACT_ALL YES) + set(DOXYGEN_MACRO_EXPANSION YES) + doxygen_add_docs(docgen + ${UIRC_HEADERS} + README.md + ALL + ) + endif() +endif() + add_library(uirc ${UIRC_SOURCE}) set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") -add_compile_options(-pedantic) if (CMAKE_C_COMPILER_ID STREQUAL "GNU") add_compile_options( -Wall @@ -115,6 +134,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU") -Wunsafe-loop-optimizations -Wparentheses -fstack-check + -pedantic ) if (CODE_ANALYZER) add_compile_options(-fanalyzer) @@ -124,6 +144,7 @@ elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang") -Weverything -Wno-padded -Wno-disabled-macro-expansion + -pedantic ) if (CODE_COVERAGE) add_compile_options(-fprofile-instr-generate -fcoverage-mapping) diff --git a/src/assemblers.c b/src/assemblers.c index 4d35d47..038e442 100644 --- a/src/assemblers.c +++ b/src/assemblers.c @@ -16,14 +16,15 @@ * along with uIRC. If not, see . */ -#include "assemblers.h" +#include "public/assemblers.h" -#include "commands.h" -#include "errors.h" -#include "memory.h" -#include "modes.h" -#include "tags.h" -#include "types.h" +#include "private/mappings.h" +#include "private/memory.h" +#include "public/commands.h" +#include "public/errors.h" +#include "public/modes.h" +#include "public/tags.h" +#include "public/types.h" #include #include diff --git a/src/capabilities.c b/src/capabilities.c index 24e1ee0..93c757f 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -16,7 +16,7 @@ * along with uIRC. If not, see . */ -#include "capabilities.h" +#include "public/capabilities.h" #include #include diff --git a/src/commands.c b/src/commands.c index 2f445e3..a97abda 100644 --- a/src/commands.c +++ b/src/commands.c @@ -16,7 +16,7 @@ * along with uIRC. If not, see . */ -#include "commands.h" +#include "public/commands.h" const char* const IRC_Cmds[] = { [ADMIN] = "ADMIN", [AWAY] = "AWAY", [CONNECT] = "CONNECT", [DIE] = "DIE", [ERROR] = "ERROR", [INFO] = "INFO", [INVITE] = "INVITE", [ISON] = "ISON", diff --git a/src/converters.c b/src/converters.c index f5bf246..5d2a8d8 100644 --- a/src/converters.c +++ b/src/converters.c @@ -16,10 +16,10 @@ * along with uIRC. If not, see . */ -#include "converters.h" +#include "public/converters.h" -#include "commands.h" -#include "errors.h" +#include "public/commands.h" +#include "public/errors.h" #include diff --git a/src/memory.c b/src/memory.c index b9c40cd..3aad0c5 100644 --- a/src/memory.c +++ b/src/memory.c @@ -16,7 +16,7 @@ * along with uIRC. If not, see . */ -#include "memory.h" +#include "private/memory.h" #include #include diff --git a/src/tokenizers.h b/src/private/mappings.h similarity index 60% rename from src/tokenizers.h rename to src/private/mappings.h index 21c1d44..aa20866 100644 --- a/src/tokenizers.h +++ b/src/private/mappings.h @@ -16,24 +16,18 @@ * along with uIRC. If not, see . */ -#include "types.h" +#include "../public/types.h" #include +#include +#include -#ifndef UIRC_GUARD_TOKENIZERS -#define UIRC_GUARD_TOKENIZERS +#ifndef UIRC_GUARD_MAPPINGS +#define UIRC_GUARD_MAPPINGS -#ifdef UIRC_IRCV3 -signed int Tok_tags(char* str, IRC_Tags* out); -#endif /* UIRC_IRCV3 */ - -signed int Tok_user(char* str, IRC_User* out, bool useorig); -signed int Tok_mesg(char* str, IRC_Message* out); - -#ifdef UIRC_HELPERS -void Tok_cmd_PING(IRC_Message* mesg, char** source, char** target); -void Tok_FArgOpt(IRC_Message* mesg, char** optarg, char** reqarg); -#endif /* UIRC_HELPERS */ - -#endif /* UIRC_GUARD_TOKENIZERS */ +struct tagmapping { + const char* const name; + IRC_Tag* assg; +}; +#endif /* UIRC_GUARD_MAPPINGS */ diff --git a/src/memory.h b/src/private/memory.h similarity index 100% rename from src/memory.h rename to src/private/memory.h diff --git a/src/string.h b/src/private/string.h similarity index 100% rename from src/string.h rename to src/private/string.h diff --git a/src/assemblers.h b/src/public/assemblers.h similarity index 100% rename from src/assemblers.h rename to src/public/assemblers.h diff --git a/src/capabilities.h b/src/public/capabilities.h similarity index 68% rename from src/capabilities.h rename to src/public/capabilities.h index eaad970..baed344 100644 --- a/src/capabilities.h +++ b/src/public/capabilities.h @@ -19,7 +19,12 @@ #ifndef UIRC_GUARD_CAPABILITIES #define UIRC_GUARD_CAPABILITIES -/* IRCv3 Supported features bits */ +/*! + * \brief List of capabilities to be used as a bitmask + * + * \sa CAPBIT + * \sa https://ircv3.net/registry#capabilities + */ enum caps { CAP_ACCOUNT_NOTIFY = 1, CAP_ACCOUNT_TAG = 2, @@ -42,11 +47,32 @@ enum caps { CAP_TLS = 19, CAP_USERHOST_IN_NAMES = 20, }; +/*! + * \brief Converts capability to bitmask value + * + * \param[in] cap Capability bit from \link caps \endlink + */ #define CAPBIT(cap) (1 << (cap)) #ifdef UIRC_HELPERS +/*! + * \brief Converts a string of capabilities to a bitmask + * + * This function converts all the capabilities from \link IRC_v3_Caps \endlink to a bitmask + * \param[in] caps String of capabilities separated by space + * \sa CAPBIT + * \sa caps + * \sa https://ircv3.net/registry#capabilities + */ int Tok_CAPS(char* caps); #endif /* UIRC_HELPERS */ + +/*! + * \brief String representations of IRCv3 capabilities + * + * This contains the capabilities from \link caps \endlink in their string form. + * \sa https://ircv3.net/registry#capabilities + */ extern const char* const IRC_v3_Caps[]; #endif /* UIRC_GUARD_CAPABILITIES */ diff --git a/src/commands.h b/src/public/commands.h similarity index 100% rename from src/commands.h rename to src/public/commands.h diff --git a/src/converters.h b/src/public/converters.h similarity index 100% rename from src/converters.h rename to src/public/converters.h diff --git a/src/errors.h b/src/public/errors.h similarity index 100% rename from src/errors.h rename to src/public/errors.h diff --git a/src/modes.h b/src/public/modes.h similarity index 100% rename from src/modes.h rename to src/public/modes.h diff --git a/src/replies.h b/src/public/replies.h similarity index 100% rename from src/replies.h rename to src/public/replies.h diff --git a/src/tags.h b/src/public/tags.h similarity index 87% rename from src/tags.h rename to src/public/tags.h index bdb0322..f3b7657 100644 --- a/src/tags.h +++ b/src/public/tags.h @@ -16,20 +16,11 @@ * along with uIRC. If not, see . */ -#include "types.h" - -#include -#include #include #ifndef UIRC_GUARD_TAGS #define UIRC_GUARD_TAGS -struct tagmapping { - const char* const name; - IRC_Tag* assg; -}; - #ifdef UIRC_HELPERS size_t Assm_tag_timestamp(char* buf, size_t len, time_t time); #endif /* UIRC_HELPERS */ diff --git a/src/public/tokenizers.h b/src/public/tokenizers.h new file mode 100644 index 0000000..425b51c --- /dev/null +++ b/src/public/tokenizers.h @@ -0,0 +1,79 @@ +/* + * This file is part of uIRC. (https://git.redxen.eu/caskd/uIRC) + * Copyright (c) 2019, 2020 Alex-David Denes + * + * uIRC is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * uIRC is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with uIRC. If not, see . + */ + +#include "types.h" + +#include + +#ifndef UIRC_GUARD_TOKENIZERS +#define UIRC_GUARD_TOKENIZERS + +#ifdef UIRC_IRCV3 +/*! + * \brief Tokenize IRCv3 tags + * + * This function parses IRCv3 tags according to the specification at + * \param[in] str String containing a IRC source with or without the ':' prefix + * \param[out] out Allocated IRC_User structure + * \param[in] useorig If '\%orig' should be considered in the parsing + */ +signed int Tok_tags(char* str, IRC_Tags* out); +#endif /* UIRC_IRCV3 */ + +/*! + * \brief Tokenize a IRC message source. + * + * This function takes the source part of a message, pointing struct elements to parts of it. + * \param[in] str String containing a IRC source with or without the ':' prefix + * \param[out] out Allocated IRC_User structure + * \param[in] useorig If '\%orig' should be considered in the parsing + */ +signed int Tok_user(char* str, IRC_User* out, bool useorig); + +/*! + * \brief Tokenize a IRC message string. + * + * This function takes a IRC Message and attempts to tokenize/parse it, pointing every element found to it's respective struct element + * \param[in] str String containing a IRC message without the ending '\\r\\n' + * \param[out] out Allocated IRC_Message structure + */ +signed int Tok_mesg(char* str, IRC_Message* out); + +#ifdef UIRC_HELPERS +/*! + * \brief A PING tokenizer/parser + * + * This function is a simple helper to get the source and target of a PING since the RFC has a "interesting" implementation + * \param[in] mesg IRC_Message struct containing the PING message + * \param[out] source Source of the PING (server) + * \param[out] target Target of the PING (server or client) + */ +void Tok_cmd_PING(IRC_Message* mesg, char** source, char** target); +/*! + * \brief Tokenizer for cases where the first argument is optional + * + * This function is a private helper for cases where the first argument might be missing but the second isn't + * \param[in] mesg IRC_Message struct + * \param[out] optarg Optional argument if given or NULL + * \param[out] target Required argument + */ +void Tok_FArgOpt(IRC_Message* mesg, char** optarg, char** reqarg); +#endif /* UIRC_HELPERS */ + +#endif /* UIRC_GUARD_TOKENIZERS */ + diff --git a/src/types.h b/src/public/types.h similarity index 99% rename from src/types.h rename to src/public/types.h index 031b3ea..ae9c18d 100644 --- a/src/types.h +++ b/src/public/types.h @@ -21,6 +21,8 @@ #ifndef UIRC_GUARD_TYPES #define UIRC_GUARD_TYPES +/*! + */ typedef unsigned short IRC_Command; #ifdef UIRC_IRCV3 diff --git a/src/uirc.h b/src/public/uirc.h similarity index 100% rename from src/uirc.h rename to src/public/uirc.h diff --git a/src/validators.h b/src/public/validators.h similarity index 100% rename from src/validators.h rename to src/public/validators.h diff --git a/src/string.c b/src/string.c index a24c466..becaebb 100644 --- a/src/string.c +++ b/src/string.c @@ -16,7 +16,7 @@ * along with uIRC. If not, see . */ -#include "string.h" +#include "private/string.h" #include diff --git a/src/tags.c b/src/tags.c index 7728e65..d71fd28 100644 --- a/src/tags.c +++ b/src/tags.c @@ -16,7 +16,7 @@ * along with uIRC. If not, see . */ -#include "tags.h" +#include "public/tags.h" #include diff --git a/tests/capbitmask.c b/src/tests/capbitmask.c similarity index 97% rename from tests/capbitmask.c rename to src/tests/capbitmask.c index d59a974..b1d179f 100644 --- a/tests/capbitmask.c +++ b/src/tests/capbitmask.c @@ -16,7 +16,7 @@ * along with uIRC. If not, see . */ -#include "../src/capabilities.h" +#include "../public/capabilities.h" #include #include diff --git a/tests/junk.c b/src/tests/junk.c similarity index 95% rename from tests/junk.c rename to src/tests/junk.c index c765898..c040b72 100644 --- a/tests/junk.c +++ b/src/tests/junk.c @@ -16,8 +16,8 @@ * along with uIRC. If not, see . */ -#include "../src/tokenizers.h" -#include "../src/types.h" +#include "../public/tokenizers.h" +#include "../public/types.h" #include #include diff --git a/tests/msgassm.c b/src/tests/msgassm.c similarity index 94% rename from tests/msgassm.c rename to src/tests/msgassm.c index 03a25aa..b7353ee 100644 --- a/tests/msgassm.c +++ b/src/tests/msgassm.c @@ -16,9 +16,9 @@ * along with uIRC. If not, see . */ -#include "../src/assemblers.h" -#include "../src/commands.h" -#include "../src/types.h" +#include "../public/assemblers.h" +#include "../public/commands.h" +#include "../public/types.h" #include #include diff --git a/tests/notrail.c b/src/tests/notrail.c similarity index 94% rename from tests/notrail.c rename to src/tests/notrail.c index 54274c3..bb1e75c 100644 --- a/tests/notrail.c +++ b/src/tests/notrail.c @@ -16,8 +16,8 @@ * along with uIRC. If not, see . */ -#include "../src/tokenizers.h" -#include "../src/types.h" +#include "../public/tokenizers.h" +#include "../public/types.h" #include #include diff --git a/tests/numericmds.c b/src/tests/numericmds.c similarity index 93% rename from tests/numericmds.c rename to src/tests/numericmds.c index 0d7457a..1bda666 100644 --- a/tests/numericmds.c +++ b/src/tests/numericmds.c @@ -16,9 +16,9 @@ * along with uIRC. If not, see . */ -#include "../src/assemblers.h" -#include "../src/replies.h" -#include "../src/types.h" +#include "../public/assemblers.h" +#include "../public/replies.h" +#include "../public/types.h" #include #include diff --git a/tests/overflow.c b/src/tests/overflow.c similarity index 95% rename from tests/overflow.c rename to src/tests/overflow.c index 7988dbb..573cf20 100644 --- a/tests/overflow.c +++ b/src/tests/overflow.c @@ -16,9 +16,9 @@ * along with uIRC. If not, see . */ -#include "../src/assemblers.h" -#include "../src/commands.h" -#include "../src/types.h" +#include "../public/assemblers.h" +#include "../public/commands.h" +#include "../public/types.h" #include #include diff --git a/tests/prefixassm.c b/src/tests/prefixassm.c similarity index 95% rename from tests/prefixassm.c rename to src/tests/prefixassm.c index c85dd1a..91a958b 100644 --- a/tests/prefixassm.c +++ b/src/tests/prefixassm.c @@ -16,8 +16,8 @@ * along with uIRC. If not, see . */ -#include "../src/assemblers.h" -#include "../src/types.h" +#include "../public/assemblers.h" +#include "../public/types.h" #include #include diff --git a/tests/spacedargs.c b/src/tests/spacedargs.c similarity index 94% rename from tests/spacedargs.c rename to src/tests/spacedargs.c index 670c398..6f81275 100644 --- a/tests/spacedargs.c +++ b/src/tests/spacedargs.c @@ -16,9 +16,9 @@ * along with uIRC. If not, see . */ -#include "../src/commands.h" -#include "../src/tokenizers.h" -#include "../src/types.h" +#include "../public/commands.h" +#include "../public/tokenizers.h" +#include "../public/types.h" #include #include diff --git a/tests/strtokmr.c b/src/tests/strtokmr.c similarity index 98% rename from tests/strtokmr.c rename to src/tests/strtokmr.c index 46d6846..196336a 100644 --- a/tests/strtokmr.c +++ b/src/tests/strtokmr.c @@ -16,7 +16,7 @@ * along with uIRC. If not, see . */ -#include "../src/string.h" +#include "../private/string.h" #include #include diff --git a/tests/tagassm.c b/src/tests/tagassm.c similarity index 95% rename from tests/tagassm.c rename to src/tests/tagassm.c index f77e680..60b3724 100644 --- a/tests/tagassm.c +++ b/src/tests/tagassm.c @@ -16,8 +16,8 @@ * along with uIRC. If not, see . */ -#include "../src/assemblers.h" -#include "../src/types.h" +#include "../public/assemblers.h" +#include "../public/types.h" #include #include diff --git a/tests/tagtok.c b/src/tests/tagtok.c similarity index 95% rename from tests/tagtok.c rename to src/tests/tagtok.c index 3d84104..0ea4dfb 100644 --- a/tests/tagtok.c +++ b/src/tests/tagtok.c @@ -16,8 +16,8 @@ * along with uIRC. If not, see . */ -#include "../src/tokenizers.h" -#include "../src/types.h" +#include "../public/tokenizers.h" +#include "../public/types.h" #include #include diff --git a/tests/timestamp.c b/src/tests/timestamp.c similarity index 94% rename from tests/timestamp.c rename to src/tests/timestamp.c index 453acf6..f414963 100644 --- a/tests/timestamp.c +++ b/src/tests/timestamp.c @@ -16,8 +16,8 @@ * along with uIRC. If not, see . */ -#include "../src/tags.h" -#include "../src/types.h" +#include "../public/tags.h" +#include "../public/types.h" #include #include diff --git a/tests/tokenizer.c b/src/tests/tokenizer.c similarity index 96% rename from tests/tokenizer.c rename to src/tests/tokenizer.c index 6d96803..500bd1f 100644 --- a/tests/tokenizer.c +++ b/src/tests/tokenizer.c @@ -16,8 +16,8 @@ * along with uIRC. If not, see . */ -#include "../src/commands.h" -#include "../src/tokenizers.h" +#include "../public/commands.h" +#include "../public/tokenizers.h" #include #include diff --git a/src/tokenizers.c b/src/tokenizers.c index b55ad62..e87d0a8 100644 --- a/src/tokenizers.c +++ b/src/tokenizers.c @@ -16,14 +16,15 @@ * along with uIRC. If not, see . */ -#include "tokenizers.h" +#include "public/tokenizers.h" -#include "commands.h" -#include "converters.h" -#include "errors.h" -#include "string.h" -#include "tags.h" -#include "types.h" +#include "private/mappings.h" +#include "private/string.h" +#include "public/commands.h" +#include "public/converters.h" +#include "public/errors.h" +#include "public/tags.h" +#include "public/types.h" #include #include diff --git a/src/validators.c b/src/validators.c index 0cf02c1..8d19f84 100644 --- a/src/validators.c +++ b/src/validators.c @@ -16,10 +16,10 @@ * along with uIRC. If not, see . */ -#include "validators.h" +#include "public/validators.h" -#include "errors.h" -#include "types.h" +#include "public/errors.h" +#include "public/types.h" #include #include