Split private functions sources (#225)

Since all symbols exported from the library are functions that don't share common code, it makes sense to separate their definitions into separate source files

Now each exported function has its own source file

Author: bugdea1er

.clang-tidy

@@ -22,6 +22,7 @@ Checks: >
   -cppcoreguidelines-pro-type-vararg,
   -misc-const-correctness,
   -misc-include-cleaner,
+  -modernize-deprecated-headers,
   -modernize-return-braced-init-list,
   -modernize-use-auto,
   -modernize-use-nodiscard,

meson.build

@@ -12,8 +12,10 @@ filesystem_dep = filesystem_proj.get_variable('filesystem_dep')
 
 tmp = library(
   'tmp',
-  'src/file.cpp',
-  'src/directory.cpp',
+  'src/create_directory.cpp',
+  'src/create_file.cpp',
+  'src/get_native_handle.cpp',
+  'src/remove_all.cpp',
   install: true,
   include_directories: include_directory,
   gnu_symbol_visibility: 'hidden',

src/CMakeLists.txt

@@ -1,6 +1,11 @@
 find_package(Filesystem REQUIRED)
 
-add_library(${PROJECT_NAME} file.cpp directory.cpp)
+add_library(${PROJECT_NAME}
+  create_directory.cpp
+  create_file.cpp
+  get_native_handle.cpp
+  remove_all.cpp)
+
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
 target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem)
 

src/directory.cpp src/create_directory.cppsrc/directory.cpp renamed to src/create_directory.cpp

@@ -3,12 +3,9 @@
 
 #include "abi.hpp"
 
-#include <tmp/directory>
-
 #include <filesystem>
 #include <string_view>
 #include <system_error>
-#include <utility>
 
 #ifdef _WIN32
 #define UNICODE
@@ -66,7 +63,7 @@ fs::path make_path(std::string_view prefix) {
 /// Creates a temporary directory in the current user's temporary directory
 /// @param prefix A prefix to attach to the temporary directory name
 /// @returns A path to the created temporary directory
-/// @throws fs::filesystem_error if cannot create a temporary directory
+/// @throws fs::filesystem_error  if cannot create a temporary directory
 /// @throws std::invalid_argument if the prefix contains a directory separator
 fs::path create_directory(std::string_view prefix) {
   if (!is_prefix_valid(prefix)) {
@@ -95,21 +92,4 @@ fs::path create_directory(std::string_view prefix) {
 
   return path;
 }
-
-/// Deletes a path recursively, ignoring any errors
-/// @param path The path to delete
-void remove_all(const fs::path& path) noexcept {
-  try {
-    if (!path.empty()) {
-      // Calling the `std::error_code` overload of `fs::remove_all` should be
-      // more optimal here since it would not require creating
-      // a `fs::filesystem_error` message before we suppress the exception
-      std::error_code ec;
-      fs::remove_all(path, ec);
-    }
-  } catch (...) {
-    // Do nothing: if we failed to delete the temporary directory,
-    // the system should do it later
-  }
-}
 }    // namespace tmp::detail

src/file.cpp src/create_file.cppsrc/file.cpp renamed to src/create_file.cpp

@@ -5,30 +5,15 @@
 
 #include "abi.hpp"
 
-#include <tmp/file>
-
+#include <cerrno>
 #include <cstdio>
 #include <filesystem>
 #include <system_error>
-#include <type_traits>
-
-#ifdef _WIN32
-#include <Windows.h>
-#include <io.h>
-#endif
 
 namespace tmp::detail {
 
 namespace fs = std::filesystem;
 
-// Confirm that native_handle_type matches `TriviallyCopyable` named requirement
-static_assert(std::is_trivially_copyable_v<file::native_handle_type>);
-
-#ifdef _WIN32
-// Confirm that `HANDLE` is as implemented in `file`
-static_assert(std::is_same_v<HANDLE, file::native_handle_type>);
-#endif
-
 /// Creates and opens a binary temporary file as if by POSIX `tmpfile`
 /// @returns A pointer to the file stream associated with the temporary file
 /// @throws fs::filesystem_error if cannot create a temporary file
@@ -41,15 +26,4 @@ std::FILE* create_file() {
 
   return file;
 }
-
-/// Returns an implementation-defined handle to the file
-/// @param[in] file The file to get the native handle for
-/// @returns The underlying implementation-defined handle
-file::native_handle_type get_native_handle(std::FILE* file) noexcept {
-#ifdef _WIN32
-  return reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(file)));
-#else
-  return fileno(file);
-#endif
-}
 }    // namespace tmp::detail

src/get_native_handle.cpp

@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: (c) 2024 Ilya Andreev <[email protected]>
+// SPDX-License-Identifier: MIT
+
+#include "abi.hpp"
+
+#include <tmp/file>
+
+#include <cstdio>
+#include <stdio.h>
+
+#ifdef _WIN32
+#include <Windows.h>
+#include <io.h>
+#endif
+
+namespace tmp::detail {
+
+/// Returns an implementation-defined handle to the file
+/// @param[in] file The file to get the native handle for
+/// @returns The underlying implementation-defined handle
+file::native_handle_type get_native_handle(std::FILE* file) noexcept {
+#ifdef _WIN32
+  return reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(file)));
+#else
+  return fileno(file);
+#endif
+}
+}    // namespace tmp::detail

src/remove_all.cpp

@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: (c) 2024 Ilya Andreev <[email protected]>
+// SPDX-License-Identifier: MIT
+
+#include "abi.hpp"
+
+#include <filesystem>
+#include <system_error>
+
+namespace tmp::detail {
+
+/// Deletes a path recursively, ignoring any errors
+/// @param path The path to delete
+void remove_all(const std::filesystem::path& path) noexcept {
+  try {
+    if (!path.empty()) {
+      std::error_code ec;
+      std::filesystem::remove_all(path, ec);
+    }
+  } catch (...) {
+    // Do nothing: if we failed to delete the temporary directory,
+    // the system should do it later
+  }
+}
+}    // namespace tmp::detail