From 57d9118d4963c551a48710a17d2add85dfc55176 Mon Sep 17 00:00:00 2001 From: ThisIsFineTM <184989147+ThisIsFineTM@users.noreply.github.com> Date: Thu, 30 Jan 2025 01:18:17 -0500 Subject: [PATCH] Fix #443: Move zimwriterfs/tools function declarations into correct header. --- src/tools.h | 2 -- src/zimwriterfs/tools.cpp | 2 -- src/zimwriterfs/tools.h | 4 ++++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools.h b/src/tools.h index 513cb2e6..d4b4ba49 100644 --- a/src/tools.h +++ b/src/tools.h @@ -168,8 +168,6 @@ class CopyItem : public zim::writer::Item //Article class that will be p } }; -std::string getMimeTypeForFile(const std::string& basedir, const std::string& filename); -std::string getFileContent(const std::string& path); std::string decodeUrl(const std::string& encodedUrl); // Assuming that basePath and targetPath are relative to the same location diff --git a/src/zimwriterfs/tools.cpp b/src/zimwriterfs/tools.cpp index 0e8e95b1..e6644b44 100644 --- a/src/zimwriterfs/tools.cpp +++ b/src/zimwriterfs/tools.cpp @@ -19,9 +19,7 @@ */ #include "tools.h" -#include "../tools.h" -#include #include #include #include diff --git a/src/zimwriterfs/tools.h b/src/zimwriterfs/tools.h index bd8f7ef1..f0f15de5 100644 --- a/src/zimwriterfs/tools.h +++ b/src/zimwriterfs/tools.h @@ -24,8 +24,12 @@ #include #include +std::string getFileContent(const std::string& path); + std::string extractRedirectUrlFromHtml(const GumboVector* head_children); std::string generateDate(); +std::string getMimeTypeForFile(const std::string& basedir, const std::string& filename); + #endif // OPENZIM_ZIMWRITERFS_TOOLS_H