writer-json-common: common utils for specific JSON writers

This commit moves sanitizeUTF8() from writer-json.cc
to writer-json-common.cc.

Related: #115

Author: kdudka

src/lib/CMakeLists.txt

@@ -44,4 +44,5 @@ add_library(cs STATIC
     writer-cov.cc
     writer-html.cc
     writer-json.cc
+    writer-json-common.cc
 )

src/lib/writer-json-common.cc

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2011 - 2023 Red Hat, Inc.
+ *
+ * This file is part of csdiff.
+ *
+ * csdiff 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.
+ *
+ * csdiff 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 csdiff.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "writer-json-common.hh"
+
+#include <boost/nowide/utf/convert.hpp>
+
+std::string sanitizeUTF8(const std::string &str)
+{
+    using boost::nowide::utf::convert_string;
+
+    // every non-UTF8 sequence will be replaced with 0xEF 0xBF 0xBD which
+    // corresponds to REPLACEMENT CHARACTER U+FFFD
+    return convert_string<char>(str.data(), str.data() + str.size());
+}

src/lib/writer-json-common.hh

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 - 2023 Red Hat, Inc.
+ *
+ * This file is part of csdiff.
+ *
+ * csdiff 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.
+ *
+ * csdiff 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 csdiff.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef H_GUARD_WRITER_JSON_COMMON_H
+#define H_GUARD_WRITER_JSON_COMMON_H
+
+#include <string>
+
+/// sanitize byte sequences that are not valid in UTF-8 encoding
+std::string sanitizeUTF8(const std::string &str);
+
+#endif /* H_GUARD_WRITER_JSON_COMMON_H */

src/lib/writer-json.cc

@@ -22,25 +22,16 @@
 #include "abstract-tree.hh"
 #include "regex.hh"
 #include "version.hh"
+#include "writer-json-common.hh"
 
 #include <algorithm>
 #include <queue>
 
 #include <boost/json/src.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/nowide/utf/convert.hpp>
 
 using namespace boost::json;
 
-static inline std::string sanitizeUTF8(const std::string &str)
-{
-    using boost::nowide::utf::convert_string;
-
-    // every non-UTF8 sequence will be replaced with 0xEF 0xBF 0xBD which
-    // corresponds to REPLACEMENT CHARACTER U+FFFD
-    return convert_string<char>(str.data(), str.data() + str.size());
-}
-
 static void prettyPrint(std::ostream&, const value&, std::string* = nullptr);
 
 static inline void prettyPrintArray(