fix build 2

Author: igagis

.vscode/tasks.json

@@ -54,7 +54,7 @@
 		{
 			"label": "format",
 			"type": "shell",
-			"command": "make apply-format",
+			"command": "make format",
 			"problemMatcher": [],
 			"group": "build"
 		}

src/fsif/file.hpp

@@ -443,11 +443,11 @@ class file
 public:
 	/**
 	 * @brief Create directory.
-	 * If this file instance is a directory then try to create that directory on the
-	 * file system. Not all file systems are writable, so not all of them support
-	 * directory creation.
-	 * The function will create all intermediate directories of the path if needed.
-	 * If the directory already exists then nothing is done.
+	 * If this file instance is a directory then try to create that directory on
+	 * the file system. Not all file systems are writable, so not all of them
+	 * support directory creation. The function will create all intermediate
+	 * directories of the path if needed. If the directory already exists then
+	 * nothing is done.
 	 * @throw std::logic_error - if file is opened.
 	 */
 	virtual void make_dir();
@@ -489,7 +489,8 @@ class file
 	virtual utki::unique_ref<file> spawn() = 0;
 
 	// NOTE: it must not be possible to modify the const file by spawning non-const file
-	//       object and setting the same path to it, so make const spawn() overloads
+	//       object and setting the same path to it, so make const spawn()
+	//       overloads
 	utki::unique_ref<const file> spawn() const
 	{
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast)
@@ -514,27 +515,23 @@ class file
 	/**
 	 * @brief file guard class.
 	 * Use this class to open the file within the particular scope.
-	 * As the file guard object goes out of the scope it will close the file in
-	 *its destructor. Usage:
+	 * As the file guard object goes out of the scope it will close the file in its destructor.
+	 * Usage:
 	 * @code
-	 *	file& fi; // assume we have some fsif::file object visible in current
-	 *scope.
+	 *	file& fi; // assume we have some fsif::file object visible in current scope.
 	 *	...
 	 *	{
 	 *		// assume the 'fi' is closed.
-	 *		// Let's create the file guard object. This will open the file
-	 *'fi'
-	 *		//  for reading by calling fi.open(fsif::file::mode::read)
-	 *method. fsif::file::guard file_guard(fi, fsif::file::mode::read);
+	 *		// Let's create the file guard object. This will open the file 'fi'
+	 *		// for reading by calling fi.open(fsif::file::mode::read) method.
+	 *      fsif::file::guard file_guard(fi, fsif::file::mode::read);
 	 *
 	 *		...
 	 *		// do some reading
 	 *		fi.read(...);
 	 *
-	 *		// going out of scope will destroy the 'file_guard' object. In
-	 *turn,
-	 *		// it will automatically close the file 'fi' in its destructor
-	 *by
+	 *		// going out of scope will destroy the 'file_guard' object. In turn,
+	 *		// it will automatically close the file 'fi' in its destructor by
 	 *		// calling fi.close() method.
 	 *	}
 	 * @endcode

src/fsif/native_file.cpp

@@ -45,8 +45,8 @@ SOFTWARE.
 #include <sstream>
 #include <vector>
 
-// On iOS < 13.0 we use 'dirent' instead of std::filesystem, since std::filesystem
-// becomes available only from iOS 13.0.
+// On iOS < 13.0 we use 'dirent' instead of std::filesystem, since
+// std::filesystem becomes available only from iOS 13.0.
 #if CFG_OS_NAME != CFG_OS_NAME_IOS || CFG_OS_IOS_DEPLOYMENT_TARGET >= 130000
 #	include <filesystem>
 #endif
@@ -128,8 +128,7 @@ size_t native_file::seek_backward_internal(size_t num_bytes_to_seek) const
 {
 	ASSERT(this->handle)
 
-	// NOTE: fseek() accepts 'long int' as offset argument which is signed and can
-	// be
+	// NOTE: fseek() accepts 'long int' as offset argument which is signed and can be
 	//       less than size_t value passed as argument to this function.
 	//       Therefore, do several seek operations with smaller offset if
 	//       necessary.
@@ -230,8 +229,8 @@ void native_file::make_dir()
 		throw std::invalid_argument("invalid directory name, should end with '/'");
 	}
 
-// On iOS the std::filesystem is available only starting from iOS 13.0, so for iOS < 13.0 we do not support directory
-// creation.
+// On iOS the std::filesystem is available only starting from iOS 13.0, so for
+// iOS < 13.0 we do not support directory creation.
 #if (CFG_OS == CFG_OS_LINUX || CFG_OS == CFG_OS_MACOSX || CFG_OS == CFG_OS_WINDOWS) && \
 	(CFG_OS_NAME != CFG_OS_NAME_IOS || CFG_OS_IOS_DEPLOYMENT_TARGET >= 130000)
 	std::filesystem::create_directories(this->path());
@@ -295,9 +294,9 @@ std::vector<std::string> native_file::list_dir(size_t max_size) const
 	std::vector<std::string> files;
 
 // For all systems except iOS < 13.0 we use new implementation via std::filesystem.
-// On iOS the std::filesystem is available only starting from iOS 13.0 while it
-// is still desired to support iOS 11.0 at least, so for iOS < 13.0 we fall back to old
-// implementation via 'dirent.h'.
+// On iOS the std::filesystem is available only starting from iOS 13.0,
+// while it is still desired to support iOS 11.0 at least, so for iOS < 13.0
+// we fall back to old implementation via 'dirent.h'.
 #if CFG_OS_NAME != CFG_OS_NAME_IOS || CFG_OS_IOS_DEPLOYMENT_TARGET >= 130000
 	std::filesystem::directory_iterator iter(this->path());
 
@@ -400,8 +399,10 @@ std::vector<std::string> native_file::list_dir(size_t max_size) const
 		errno = 0;
 		while (dirent* pent = readdir(pdir)) {
 			std::string s(pent->d_name);
-			if (s == "." || s == "..")
-				continue; // do not add ./ and ../ directories, we are not interested in them
+			if (s == "." || s == "..") {
+				// do not add ./ and ../ directories, we are not interested in them
+				continue;
+			}
 
 			struct stat fileStats;
 			if (stat((this->path() + s).c_str(), &fileStats) < 0) {
@@ -410,8 +411,10 @@ std::vector<std::string> native_file::list_dir(size_t max_size) const
 				throw std::system_error(errno, std::system_category(), ss.str());
 			}
 
-			if (fileStats.st_mode & S_IFDIR) // if this entry is a directory append '/' symbol to its end
+			if (fileStats.st_mode & S_IFDIR) {
+				// if this entry is a directory append '/' symbol to its end
 				s += "/";
+			}
 
 			files.push_back(s);
 

src/fsif/native_file.hpp

@@ -58,8 +58,7 @@ class native_file : public file
 
 	size_t write_internal(utki::span<const uint8_t> buf) override;
 
-	// NOTE: use default implementation of seek_forward() because of the problems
-	// with
+	// NOTE: use default implementation of seek_forward() because of the problems with
 	//       fseek(), as it can set file pointer beyond the end of file.
 
 	size_t seek_backward_internal(size_t num_bytes_to_seek) const override;

src/fsif/root_dir.hpp

@@ -37,7 +37,7 @@ namespace fsif {
 // TODO: doxygen
 class root_dir : public file
 {
-	union base_file_union{
+	union base_file_union {
 		utki::unique_ref<file> variable;
 		utki::unique_ref<const file> constant;
 
@@ -55,29 +55,35 @@ class root_dir : public file
 		base_file_union(base_file_union&&) = delete;
 		base_file_union& operator=(base_file_union&&) = delete;
 
-		~base_file_union(){
-			// doesn't matter on which memeber to call the destrcutor, as the difference is only in constness
+		~base_file_union()
+		{
+			// doesn't matter on which memeber to call the destrcutor, as the
+			// difference is only in constness
 			this->variable.~unique_ref();
 		}
 	} base_file;
 
 	std::string root_directory;
 
-	// This constructor is private because the object it constructs can only be used in const context.
+	// This constructor is private because the object it constructs can only be
+	// used in const context.
 	root_dir(
 		utki::unique_ref<const file> base_file, //
-		std::string root_directory
+		std::string root_directory,
+		bool // dummy parameter to disambiguate from the another constructor
 	) :
 		base_file(std::move(base_file)),
 		root_directory(std::move(root_directory))
 	{
 		this->init();
 	}
 
-	void init(){
+	void init()
+	{
 		this->file::set_path_internal(std::string(this->base_file.constant.get().path()));
 		this->base_file.variable.get().set_path(this->root_directory + this->path());
 	}
+
 public:
 	/**
 	 * @param base_file - a file to wrap.
@@ -101,19 +107,13 @@ class root_dir : public file
 	 * trailing '/' character.
 	 * @return constant root_dir.
 	 */
-	static utki::unique_ref<const root_dir> make(
-		utki::unique_ref<const file> base_file,
-		std::string root_directory
-	)
-	{
-		return utki::unique_ref(
-			std::unique_ptr<const root_dir>(
-				new root_dir(
-					std::move(base_file),
-					std::move(root_directory)
-				)
-			)
-		);
+	static utki::unique_ref<const root_dir> make(utki::unique_ref<const file> base_file, std::string root_directory)
+	{
+		return utki::unique_ref(std::unique_ptr<const root_dir>(new root_dir(
+			std::move(base_file),
+			std::move(root_directory),
+			false // dummy parameter to disambiguate from the another constructor
+		)));
 	}
 
 	root_dir(const root_dir&) = delete;

src/fsif/span_file.hpp

@@ -76,8 +76,11 @@ class span_file : public file
 	{}
 
 	span_file(utki::span<const char> data) :
-		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-		span_file(utki::make_span(reinterpret_cast<const uint8_t*>(data.data()), data.size()))
+		span_file(utki::make_span(
+			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+			reinterpret_cast<const uint8_t*>(data.data()),
+			data.size()
+		))
 	{}
 
 	~span_file() noexcept override = default;

src/fsif/util.hpp

@@ -33,7 +33,8 @@ namespace fsif {
 
 /**
  * @brief Check if path represents a directory.
- * Empty path is not considered a directory, so the function will return false for empty path.
+ * Empty path is not considered a directory, so the function will return false
+ * for empty path.
  * @param path_name - path name to check.
  * @return true if path name ends with forward slash character '/'.
  * @return false otherwise.
@@ -101,8 +102,9 @@ std::string as_dir(std::string_view path);
 
 /**
  * @brief Convert path to a file path.
- * Path to a file differs from a path to a directory by that it does not have the trailing slash '/' character.
- * This function removes the trailing slash character from a path if it is present.
+ * Path to a file differs from a path to a directory by that it does not have
+ * the trailing slash '/' character. This function removes the trailing slash
+ * character from a path if it is present.
  * @param path - path to convert to a file path.
  * @return A path to a file.
  */

src/fsif/vector_file.hpp

@@ -50,7 +50,9 @@ class vector_file : public file
 
 private:
 	std::vector<uint8_t> data;
-	mutable size_t idx = 0; // current file position
+
+	// current file position
+	mutable size_t idx = 0;
 
 public:
 	/**

tests/span_file/main.cpp

@@ -1,5 +1,7 @@
 #include "../../src/fsif/span_file.hpp"
 
+#include <utki/debug.hpp>
+
 // NOLINTNEXTLINE(bugprone-exception-escape, "we want uncaught exceptions to fail the tests")
 int main(int /* argc */, const char** /* argv */){
 	// test read only span_file
@@ -56,9 +58,8 @@ int main(int /* argc */, const char** /* argv */){
 		}
 
 		auto file2 = file.spawn();
-		utki::assert(file2, SL);
 
-		auto res = file2->load();
+		auto res = file2.get().load();
 
 		file.close();
 

tests/zip_file/tests.cpp

@@ -8,7 +8,7 @@ namespace test_fsif_zip_file{
 void run(){
 	// list directory contents
 	{
-		fsif::zip_file zip_f(std::make_unique<fsif::native_file>("test.zip"));
+		fsif::zip_file zip_f(utki::make_unique<fsif::native_file>("test.zip"));
 		utki::assert(!zip_f.is_dir(), SL);
 		utki::assert(!zip_f.is_open(), SL);
 
@@ -51,7 +51,7 @@ void run(){
 
 	// reading file
 	{
-		fsif::zip_file zip_f(std::make_unique<fsif::native_file>("test.zip"), "dir1/test2.txt");
+		fsif::zip_file zip_f(utki::make_unique<fsif::native_file>("test.zip"), "dir1/test2.txt");
 		utki::assert(!zip_f.is_dir(), SL);
 		utki::assert(!zip_f.is_open(), SL);