const fixes + noexcept in path_utils

Author: mrotteveel

src/common/os/path_utils.h

@@ -46,11 +46,11 @@ class PathUtils
 	static const char dir_sep;
 
 	/// String used to point to current directory
-	static const char* curr_dir_link;
+	static const char* const curr_dir_link;
 	static const size_t curr_dir_link_len;
 
 	/// String used to point to parent directory
-	static const char* up_dir_link;
+	static const char* const up_dir_link;
 	static const size_t up_dir_link_len;
 
 	/// The directory list separator for the platform.
@@ -78,6 +78,13 @@ class PathUtils
 		// Destructor provided for memory cleanup
 		virtual ~DirIterator() {}
 
+		// Default constructor is not allowed
+		DirIterator() = delete;
+		// Copy constructor is not allowed
+		DirIterator(const DirIterator&) = delete;
+		// Assignment operator is not allowed
+		const DirIterator& operator=(const DirIterator&) = delete;
+
 		// The prefix increment operator (++itr) advances the iteration by
 		// one and returns a reference to itself to allow cascading operations
 		virtual const DirIterator& operator++() = 0;
@@ -86,24 +93,16 @@ class PathUtils
 		// item in the iteration.  This path is prefixed with the path of
 		// the directory.  If the last element of the path is wanted use
 		// PathUtils::splitLastComponent on the result of this function.
-		virtual const Firebird::PathName& operator*() = 0;
+		virtual const Firebird::PathName& operator*() noexcept = 0;
 
 		// Tests if the iterator has reached the end of the iteration.
 		// It is implemented in such a way to make the following loop work correctly:
 		// for (DirIterator *itr = PathUtils::newDirIterator(); *itr; ++(*itr))
-		virtual operator bool() = 0;
+		virtual operator bool() noexcept = 0;
 
 	protected:
 		// Stores the path to the directory as given in the constructor
 		const Firebird::PathName dirPrefix;
-
-	private:
-		// Default constructor is not allowed
-		DirIterator();
-		// Copy constructor is not allowed
-		DirIterator(const DirIterator&);
-		// Assignment operator is not allowed
-		const DirIterator& operator=(const DirIterator&);
 	};
 
 	/** isRelative returns true if the given path is relative, and false if not.
@@ -141,9 +140,9 @@ class PathUtils
 	static void ensureSeparator(Firebird::PathName& in_out);
 
 	// Ensure the path separators are correct for the current platform
-	static void fixupSeparators(char* path);
+	static void fixupSeparators(char* path) noexcept;
 
-	static void fixupSeparators(Firebird::PathName& path)
+	static void fixupSeparators(Firebird::PathName& path) noexcept
 	{
 		fixupSeparators(path.begin());
 	}

src/common/os/posix/path_utils.cpp

@@ -32,17 +32,18 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
+#include <string>
 
 using namespace Firebird;
 
 /// The POSIX implementation of the path_utils abstraction.
 
 const char PathUtils::dir_sep = '/';
-const char* PathUtils::curr_dir_link = ".";
-const char* PathUtils::up_dir_link = "..";
+const char* const PathUtils::curr_dir_link = ".";
+const char* const PathUtils::up_dir_link = "..";
 const char PathUtils::dir_list_sep = ':';
-const size_t PathUtils::curr_dir_link_len = strlen(curr_dir_link);
-const size_t PathUtils::up_dir_link_len = strlen(up_dir_link);
+const size_t PathUtils::curr_dir_link_len = std::char_traits<char>::length(curr_dir_link);
+const size_t PathUtils::up_dir_link_len = std::char_traits<char>::length(up_dir_link);
 
 class PosixDirIterator : public PathUtils::DirIterator
 {
@@ -61,9 +62,9 @@ class PosixDirIterator : public PathUtils::DirIterator
 
 	~PosixDirIterator();
 
-	const PosixDirIterator& operator++();
-	const PathName& operator*() { return file; }
-	operator bool() { return !done; }
+	const PosixDirIterator& operator++() override;
+	const PathName& operator*() noexcept override { return file; }
+	operator bool() noexcept override { return !done; }
 
 private:
 	DIR* dir;
@@ -220,7 +221,7 @@ void PathUtils::ensureSeparator(PathName& in_out)
 		in_out += PathUtils::dir_sep;
 }
 
-void PathUtils::fixupSeparators(char* path)
+void PathUtils::fixupSeparators(char* path) noexcept
 {
 	for (; *path; ++path)
 	{

src/common/os/win32/path_utils.cpp

@@ -3,19 +3,20 @@
 #include "../common/os/path_utils.h"
 #include <io.h> 		// _access
 #include <direct.h>		// _mkdir
+#include <string>
 
 using namespace Firebird;
 
 /// The Win32 implementation of the path_utils abstraction.
 
 const char PathUtils::dir_sep = '\\';
-const char* PathUtils::curr_dir_link = ".";
-const char* PathUtils::up_dir_link = "..";
+const char* const PathUtils::curr_dir_link = ".";
+const char* const PathUtils::up_dir_link = "..";
 const char PathUtils::dir_list_sep = ';';
-const size_t PathUtils::curr_dir_link_len = strlen(curr_dir_link);
-const size_t PathUtils::up_dir_link_len = strlen(up_dir_link);
+const size_t PathUtils::curr_dir_link_len = std::char_traits<char>::length(curr_dir_link);
+const size_t PathUtils::up_dir_link_len = std::char_traits<char>::length(up_dir_link);
 
-class Win32DirIterator : public PathUtils::DirIterator
+class Win32DirIterator final : public PathUtils::DirIterator
 {
 public:
 	Win32DirIterator(MemoryPool& p, const PathName& path)
@@ -32,9 +33,9 @@ class Win32DirIterator : public PathUtils::DirIterator
 
 	~Win32DirIterator();
 
-	const PathUtils::DirIterator& operator++();
-	const PathName& operator*() { return file; }
-	operator bool() { return !done; }
+	const PathUtils::DirIterator& operator++() override;
+	const PathName& operator*() noexcept override { return file; }
+	operator bool() noexcept override { return !done; }
 
 private:
 	HANDLE dir;
@@ -202,7 +203,7 @@ void PathUtils::ensureSeparator(PathName& in_out)
 		in_out += PathUtils::dir_sep;
 }
 
-void PathUtils::fixupSeparators(char* path)
+void PathUtils::fixupSeparators(char* path) noexcept
 {
 	for (; *path; ++path)
 	{