Long, long round of refactoring path_view to match latest P1030 draft normative wording. Not done yet however, so this is a wip commit.

4 files changed, 13 insertions, 11 deletions

diff --git a/test/tests/clone_extents.cpp b/test/tests/clone_extents.cpp
index 315b3427..2d8dfc87 100644
--- a/test/tests/clone_extents.cpp
+++ b/test/tests/clone_extents.cpp
@@ -260,7 +260,7 @@ static inline void TestCloneOrCopyTree()
         to_hex_string(buffer + 1, 8, (const char *) &c, 4);
         buffer[9] = 0;
       }
-      auto h = directory_handle::directory(dirh, path_view(buffer, 9, true), directory_handle::mode::write, directory_handle::creation::if_needed).value();
+      auto h = directory_handle::directory(dirh, path_view(buffer, 9, path_view::zero_terminated), directory_handle::mode::write, directory_handle::creation::if_needed).value();
       entries_created++;
       for(size_t n = 0; n < file_entries; n++)
       {
@@ -268,7 +268,7 @@ static inline void TestCloneOrCopyTree()
         buffer[0] = 'f';
         to_hex_string(buffer + 1, 2, (const char *) &c, 1);
         buffer[3] = 0;
-        file_handle::file(h, path_view(buffer, 3, true), file_handle::mode::write, file_handle::creation::if_needed).value();
+        file_handle::file(h, path_view(buffer, 3, path_view::zero_terminated), file_handle::mode::write, file_handle::creation::if_needed).value();
         entries_created++;
       }
       dirhs.emplace_back(std::move(h));
diff --git a/test/tests/path_view.cpp b/test/tests/path_view.cpp
index f8f40da2..f983b734 100644
--- a/test/tests/path_view.cpp
+++ b/test/tests/path_view.cpp
@@ -118,9 +118,9 @@ static inline void TestPathView()
   BOOST_CHECK(0 == f.compare<>("0"));
 #ifndef _WIN32
   // cstr
-  llfio::path_view::c_str<> g(e);
+  llfio::path_view::c_str<> g(e, llfio::path_view::zero_terminated);
   BOOST_CHECK(g.buffer != p);  // NOLINT
-  llfio::path_view::c_str<> h(f);
+  llfio::path_view::c_str<> h(f, llfio::path_view::zero_terminated);
   BOOST_CHECK(h.buffer == p + 70);  // NOLINT
 #endif
   CheckPathView("/mnt/c/Users/ned/Documents/boostish/afio/programs/build_posix/testdir");
@@ -162,11 +162,11 @@ static inline void TestPathView()
   BOOST_CHECK(0 == g.compare<>("\\mnt\\c\\Users\\ned\\Documents\\boostish\\afio\\programs\\build_posix\\testdir"));
   BOOST_CHECK(0 == h.compare<>("0"));
   // cstr
-  llfio::path_view::c_str<> i(g, false);
+  llfio::path_view::c_str<> i(g, llfio::path_view::not_zero_terminated);
   BOOST_CHECK(i.buffer != p2);
-  llfio::path_view::c_str<> j(g, true);
+  llfio::path_view::c_str<> j(g, llfio::path_view::zero_terminated);
   BOOST_CHECK(j.buffer == p2);
-  llfio::path_view::c_str<> k(h, false);
+  llfio::path_view::c_str<> k(h, llfio::path_view::not_zero_terminated);
   BOOST_CHECK(k.buffer == p2 + 70);
 
   CheckPathView(L"\\mnt\\c\\Users\\ned\\Documents\\boostish\\afio\\programs\\build_posix\\testdir\\0");
diff --git a/test/tests/reduce.cpp b/test/tests/reduce.cpp
index 88aad648..c46745a1 100644
--- a/test/tests/reduce.cpp
+++ b/test/tests/reduce.cpp
@@ -78,7 +78,9 @@ static inline void TestReduce()
         to_hex_string(buffer + 1, 8, (const char *) &c, 4);
         buffer[9] = 0;
       }
-      auto h = directory_handle::directory(dirh, path_view(buffer, 9, true), directory_handle::mode::write, directory_handle::creation::if_needed).value();
+      auto h =
+      directory_handle::directory(dirh, path_view(buffer, 9, path_view::zero_terminated), directory_handle::mode::write, directory_handle::creation::if_needed)
+      .value();
       entries_created++;
       for(size_t n = 0; n < file_entries; n++)
       {
@@ -86,7 +88,7 @@ static inline void TestReduce()
         buffer[0] = 'f';
         to_hex_string(buffer + 1, 2, (const char *) &c, 1);
         buffer[3] = 0;
-        file_handle::file(h, path_view(buffer, 3, true), file_handle::mode::write, file_handle::creation::if_needed).value();
+        file_handle::file(h, path_view(buffer, 3, path_view::zero_terminated), file_handle::mode::write, file_handle::creation::if_needed).value();
         entries_created++;
       }
       dirhs.emplace_back(std::move(h));
diff --git a/test/tests/traverse.cpp b/test/tests/traverse.cpp
index a019ff3f..57d5a667 100644
--- a/test/tests/traverse.cpp
+++ b/test/tests/traverse.cpp
@@ -146,14 +146,14 @@ static inline void TestTraverse()
         to_hex_string(buffer + 1, 8, (const char *) &c, 4);
         buffer[9] = 0;
       }
-      auto h = directory_handle::directory(dirh, path_view(buffer, 9, true), directory_handle::mode::write, directory_handle::creation::if_needed).value();
+      auto h = directory_handle::directory(dirh, path_view(buffer, 9, path_view::zero_terminated), directory_handle::mode::write, directory_handle::creation::if_needed).value();
       for(size_t n = 0; n < file_entries; n++)
       {
         auto c = (uint8_t) n;
         buffer[0] = 'f';
         to_hex_string(buffer + 1, 2, (const char *) &c, 1);
         buffer[3] = 0;
-        file_handle::file(h, path_view(buffer, 3, true), file_handle::mode::write, file_handle::creation::if_needed).value();
+        file_handle::file(h, path_view(buffer, 3, path_view::zero_terminated), file_handle::mode::write, file_handle::creation::if_needed).value();
         entries_created++;
       }
       entries_created++;