io/UniqueFileDescriptor: use AdoptTag in the constructors that adopt …

…ownership
CM4all · Jan 23, 2025 · 17b12fe · 17b12fe
1 parent f29804d
commit 17b12fe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/libcommon b/libcommon
diff --git a/src/io/FdCache.cxx b/src/io/FdCache.cxx
@@ -304,7 +304,7 @@ FdCache::Item::Start(FileDescriptor directory, std::size_t strip_length,
 		int _fd = openat2(directory.Get(), p,
 				  &how, sizeof(how));
 		if (_fd >= 0) {
-			fd = UniqueFileDescriptor{_fd};
+			fd = UniqueFileDescriptor{AdoptTag{}, _fd};
 			RegisterInotify();
 			InvokeSuccess();
 		} else {

diff --git a/test/run_was.cxx b/test/run_was.cxx
@@ -238,7 +238,7 @@ try {
 	context.process = was_launch(spawn_service, nullptr, "was",
 				     path, args,
 				     child_options,
-				     UniqueFileDescriptor(::dup(STDERR_FILENO)));
+				     FileDescriptor{STDERR_FILENO}.Duplicate());
 	context.control.emplace(context.event_loop, context.process.control, context);
 
 	was_client_request(context.root_pool, nullptr,

diff --git a/test/was_mirror.cxx b/test/was_mirror.cxx
@@ -35,8 +35,8 @@ main(int, char **)
 
 	WasSocket socket{
 		UniqueSocketDescriptor{AdoptTag{}, 3},
-		UniqueFileDescriptor(STDIN_FILENO),
-		UniqueFileDescriptor(STDOUT_FILENO),
+		UniqueFileDescriptor{AdoptTag{}, STDIN_FILENO},
+		UniqueFileDescriptor{AdoptTag{}, STDOUT_FILENO},
 	};
 
 	Instance instance;
+1 −1		src/event/InotifyEvent.cxx
+3 −3		src/io/Beneath.cxx
+1 −1		src/io/FileDescriptor.cxx
+1 −1		src/io/MakeDirectory.cxx
+4 −4		src/io/Pipe.cxx
+1 −1		src/io/StateDirectories.cxx
+3 −2		src/io/UniqueFileDescriptor.hxx
+1 −1		src/io/uring/CoOperation.cxx
+1 −1		src/io/uring/Open.cxx
+1 −1		src/io/uring/OpenStat.cxx
+1 −1		src/net/MultiReceiveMessage.cxx
+1 −1		src/net/ReceiveMessage.hxx
+1 −1		src/net/SocketDescriptor.cxx
+1 −1		src/net/UniqueSocketDescriptor.hxx
+1 −1		src/spawn/Direct.cxx
+1 −1		src/spawn/Launch.cxx
+1 −1		src/spawn/Mount.cxx
+1 −1		src/spawn/ScopeProcess.cxx
+1 −1		src/system/EpollFD.cxx
+3 −3		src/system/LinuxFD.cxx
+3 −3		src/system/Mount.cxx
+2 −2		src/was/async/SimpleRun.cxx