minor util changes

Author: andiwand

src/odr/internal/util/odr_meta_util.hpp

@@ -7,5 +7,7 @@ struct FileMeta;
 }
 
 namespace odr::internal::util::meta {
+
 nlohmann::json meta_to_json(const FileMeta &meta);
+
 }

src/odr/internal/util/stream_util.cpp

@@ -11,12 +11,12 @@ using int_type = std::streambuf::int_type;
 static constexpr int_type eof = std::streambuf::traits_type::eof();
 
 std::string stream::read(std::istream &in) {
-  return std::string(std::istreambuf_iterator<char>(in), {});
+  return {std::istreambuf_iterator<char>(in), {}};
 }
 
 std::string stream::read(std::istream &in, std::size_t size) {
   std::string result(size, '\0');
-  in.read(result.data(), size);
+  in.read(result.data(), static_cast<std::streamsize>(size));
   result.resize(in.gcount());
   return result;
 }
@@ -94,13 +94,13 @@ std::istream &stream::pipe_until(std::istream &in, std::ostream &out,
       return in;
     }
     if (inclusive) {
-      out.put(c);
+      out.put(static_cast<char>(c));
     }
     if (c == until_char) {
       return in;
     }
     if (!inclusive) {
-      out.put(c);
+      out.put(static_cast<char>(c));
     }
   }
 }

src/odr/internal/util/string_util.hpp

@@ -6,6 +6,7 @@
 #include <vector>
 
 namespace odr::internal::util::string {
+
 bool starts_with(const std::string &string, const std::string &with);
 bool ends_with(const std::string &string, const std::string &with);
 
@@ -26,4 +27,5 @@ std::string to_string(double d, int precision);
 std::string u16string_to_string(const std::u16string &string);
 std::u16string string_to_u16string(const std::string &string);
 std::string c16str_to_string(const char16_t *c16str, std::size_t length);
+
 } // namespace odr::internal::util::string

src/odr/internal/util/xml_util.hpp

@@ -17,6 +17,7 @@ class Path;
 }
 
 namespace odr::internal::util::xml {
+
 pugi::xml_document parse(const std::string &);
 pugi::xml_document parse(std::istream &);
 pugi::xml_document parse(const abstract::ReadableFilesystem &, const Path &);
@@ -36,4 +37,5 @@ struct StringToken {
 };
 
 std::vector<StringToken> tokenize_text(const std::string &text);
+
 } // namespace odr::internal::util::xml