From c0176958950a91cec4e1a2b1bc0f898ca9bf5c1c Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 20 May 2021 10:46:57 +0100 Subject: [PATCH] [Minor] Move html code to a separate subdir (no functional changes) --- src/libmime/images.c | 2 +- src/libmime/message.c | 2 +- src/libmime/mime_expressions.c | 2 +- src/libserver/CMakeLists.txt | 2 +- src/libserver/css/css_selector.hxx | 2 +- src/libserver/{ => html}/html.c | 0 src/libserver/{ => html}/html.h | 0 src/libserver/{ => html}/html_colors.h | 0 src/libserver/{ => html}/html_entities.h | 0 src/libserver/{ => html}/html_tags.h | 0 src/libstat/stat_process.c | 2 +- src/lua/lua_html.c | 4 +--- src/lua/lua_parsers.c | 2 +- 13 files changed, 8 insertions(+), 10 deletions(-) rename src/libserver/{ => html}/html.c (100%) rename src/libserver/{ => html}/html.h (100%) rename src/libserver/{ => html}/html_colors.h (100%) rename src/libserver/{ => html}/html_entities.h (100%) rename src/libserver/{ => html}/html_tags.h (100%) diff --git a/src/libmime/images.c b/src/libmime/images.c index 73ff43910..960036d78 100644 --- a/src/libmime/images.c +++ b/src/libmime/images.c @@ -17,7 +17,7 @@ #include "images.h" #include "task.h" #include "message.h" -#include "html.h" +#include "libserver/html/html.h" #define msg_debug_images(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_images_log_id, "images", task->task_pool->tag.uid, \ diff --git a/src/libmime/message.c b/src/libmime/message.c index 6f39cc947..21ab36e27 100644 --- a/src/libmime/message.c +++ b/src/libmime/message.c @@ -17,7 +17,7 @@ #include "util.h" #include "rspamd.h" #include "message.h" -#include "html.h" +#include "libserver/html/html.h" #include "images.h" #include "archives.h" #include "tokenizers/tokenizers.h" diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c index d0c1704ad..99c5d3a19 100644 --- a/src/libmime/mime_expressions.c +++ b/src/libmime/mime_expressions.c @@ -20,7 +20,7 @@ #include "rspamd.h" #include "message.h" #include "mime_expressions.h" -#include "html.h" +#include "libserver/html/html.h" #include "lua/lua_common.h" #include "utlist.h" diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt index 21c0e789a..b17d55e4f 100644 --- a/src/libserver/CMakeLists.txt +++ b/src/libserver/CMakeLists.txt @@ -11,7 +11,6 @@ SET(LIBRSPAMDSERVERSRC ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend.c ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend_sqlite.c ${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend/fuzzy_backend_redis.c - ${CMAKE_CURRENT_SOURCE_DIR}/html.c ${CMAKE_CURRENT_SOURCE_DIR}/milter.c ${CMAKE_CURRENT_SOURCE_DIR}/monitored.c ${CMAKE_CURRENT_SOURCE_DIR}/protocol.c @@ -35,6 +34,7 @@ SET(LIBRSPAMDSERVERSRC ${CMAKE_CURRENT_SOURCE_DIR}/http/http_context.c ${CMAKE_CURRENT_SOURCE_DIR}/maps/map.c ${CMAKE_CURRENT_SOURCE_DIR}/maps/map_helpers.c + ${CMAKE_CURRENT_SOURCE_DIR}/html/html.c ${LIBCSSSRC}) # Librspamd-server diff --git a/src/libserver/css/css_selector.hxx b/src/libserver/css/css_selector.hxx index 7a211c11c..633b12c70 100644 --- a/src/libserver/css/css_selector.hxx +++ b/src/libserver/css/css_selector.hxx @@ -28,7 +28,7 @@ #include "function2/function2.hpp" #include "parse_error.hxx" #include "css_parser.hxx" -#include "html_tags.h" +#include "libserver/html/html_tags.h" namespace rspamd::css { diff --git a/src/libserver/html.c b/src/libserver/html/html.c similarity index 100% rename from src/libserver/html.c rename to src/libserver/html/html.c diff --git a/src/libserver/html.h b/src/libserver/html/html.h similarity index 100% rename from src/libserver/html.h rename to src/libserver/html/html.h diff --git a/src/libserver/html_colors.h b/src/libserver/html/html_colors.h similarity index 100% rename from src/libserver/html_colors.h rename to src/libserver/html/html_colors.h diff --git a/src/libserver/html_entities.h b/src/libserver/html/html_entities.h similarity index 100% rename from src/libserver/html_entities.h rename to src/libserver/html/html_entities.h diff --git a/src/libserver/html_tags.h b/src/libserver/html/html_tags.h similarity index 100% rename from src/libserver/html_tags.h rename to src/libserver/html/html_tags.h diff --git a/src/libstat/stat_process.c b/src/libstat/stat_process.c index 0b22cbd11..d8b0a3349 100644 --- a/src/libstat/stat_process.c +++ b/src/libstat/stat_process.c @@ -19,7 +19,7 @@ #include "stat_internal.h" #include "libmime/message.h" #include "libmime/images.h" -#include "libserver/html.h" +#include "libserver/html/html.h" #include "lua/lua_common.h" #include "libserver/mempool_vars_internal.h" #include "utlist.h" diff --git a/src/lua/lua_html.c b/src/lua/lua_html.c index 6a21dd98d..5b1c9c452 100644 --- a/src/lua/lua_html.c +++ b/src/lua/lua_html.c @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include "lua_common.h" #include "message.h" -#include "html.h" -#include "html_tags.h" +#include "libserver/html/html.h" #include "images.h" #include "contrib/mumhash/mum.h" diff --git a/src/lua/lua_parsers.c b/src/lua/lua_parsers.c index edc838b6c..a0c2f264d 100644 --- a/src/lua/lua_parsers.c +++ b/src/lua/lua_parsers.c @@ -17,7 +17,7 @@ #include "lua_common.h" #include "tokenizers/tokenizers.h" #include "contrib/uthash/utlist.h" -#include "libserver/html.h" +#include "libserver/html/html.h" #include "libmime/email_addr.h" #include "libmime/content_type.h" #include "libmime/mime_headers.h" -- 2.39.5