Moved more code into zen namespace, for consistency

Also removed snapshot_manifest (remnants of vfs prototype)

1 files changed, 16 insertions, 16 deletions

diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 9e370ae10..55b592ab1 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -46,7 +46,7 @@ namespace zenutil {
 			{
 				if (!SetSecurityDescriptorDacl(&m_Sd, TRUE, (PACL)NULL, FALSE))
 				{
-					zen::ThrowLastError("SetSecurityDescriptorDacl failed", std::source_location::current());
+					ThrowLastError("SetSecurityDescriptorDacl failed", std::source_location::current());
 				}
 
 				m_Attributes.lpSecurityDescriptor = &m_Sd;
@@ -108,7 +108,7 @@ ZenServerState::Initialize()
 
 		if (hMap == NULL)
 		{
-			zen::ThrowLastError("Could not open or create file mapping object for Zen server state");
+			ThrowLastError("Could not open or create file mapping object for Zen server state");
 		}
 
 		m_hMapFile = hMap;
@@ -122,7 +122,7 @@ ZenServerState::Initialize()
 
 	if (pBuf == NULL)
 	{
-		zen::ThrowLastError("Could not map view of Zen server state");
+		ThrowLastError("Could not map view of Zen server state");
 	}
 
 	m_Data		 = reinterpret_cast<ZenServerEntry*>(pBuf);
@@ -149,7 +149,7 @@ ZenServerState::InitializeReadOnly()
 
 	if (pBuf == NULL)
 	{
-		zen::ThrowLastError("Could not map view of Zen server state");
+		ThrowLastError("Could not map view of Zen server state");
 	}
 
 	m_Data = reinterpret_cast<ZenServerEntry*>(pBuf);
@@ -181,7 +181,7 @@ ZenServerState::Register(int ListenPort)
 
 	// Allocate an entry
 
-	int Pid = zen::GetCurrentProcessId();
+	int Pid = GetCurrentProcessId();
 
 	for (int i = 0; i < m_MaxEntryCount; ++i)
 	{
@@ -199,7 +199,7 @@ ZenServerState::Register(int ListenPort)
 				Entry.Pid	= Pid;
 				Entry.Flags = 0;
 
-				const zen::Oid SesId = zen::GetSessionId();
+				const Oid SesId = GetSessionId();
 				memcpy(Entry.SessionId, &SesId, sizeof SesId);
 
 				return &Entry;
@@ -226,7 +226,7 @@ ZenServerState::Sweep()
 
 		if (Entry.ListenPort)
 		{
-			if (zen::IsProcessRunning(Entry.Pid) == false)
+			if (IsProcessRunning(Entry.Pid) == false)
 			{
 				ZEN_DEBUG("Sweep - pid {} not running, reclaiming entry (port {})", Entry.Pid, Entry.ListenPort);
 
@@ -323,7 +323,7 @@ ZenServerEnvironment::InitializeForTest(std::filesystem::path ProgramBaseDir, st
 
 	ZEN_INFO("Program base dir is '{}'", ProgramBaseDir);
 	ZEN_INFO("Cleaning test base dir '{}'", TestBaseDir);
-	zen::DeleteDirectories(TestBaseDir.c_str());
+	DeleteDirectories(TestBaseDir.c_str());
 
 	m_IsTestInstance = true;
 	m_IsInitialized	 = true;
@@ -334,14 +334,14 @@ ZenServerEnvironment::CreateNewTestDir()
 {
 	using namespace std::literals;
 
-	zen::ExtendableWideStringBuilder<256> TestDir;
+	ExtendableWideStringBuilder<256> TestDir;
 	TestDir << "test"sv << int64_t(++TestCounter);
 
 	std::filesystem::path TestPath = m_TestBaseDir / TestDir.c_str();
 
 	ZEN_INFO("Creating new test dir @ '{}'", TestPath);
 
-	zen::CreateDirectories(TestPath.c_str());
+	CreateDirectories(TestPath.c_str());
 
 	return TestPath;
 }
@@ -406,16 +406,16 @@ ZenServerInstance::SpawnServer(int BasePort, std::string_view AdditionalServerAr
 	const int MyPid	  = _getpid();
 	const int ChildId = ++ChildIdCounter;
 
-	zen::ExtendableStringBuilder<32> ChildEventName;
+	ExtendableStringBuilder<32> ChildEventName;
 	ChildEventName << "Zen_Child_" << ChildId;
-	zen::NamedEvent ChildEvent{ChildEventName};
+	NamedEvent ChildEvent{ChildEventName};
 
 	CreateShutdownEvent(BasePort);
 
-	zen::ExtendableStringBuilder<32> LogId;
+	ExtendableStringBuilder<32> LogId;
 	LogId << "Zen" << ChildId;
 
-	zen::ExtendableWideStringBuilder<512> CommandLine;
+	ExtendableWideStringBuilder<512> CommandLine;
 	CommandLine << "\"";
 	CommandLine.Append(Executable.c_str());
 	CommandLine << "\"";
@@ -554,10 +554,10 @@ ZenServerInstance::SpawnServer(int BasePort, std::string_view AdditionalServerAr
 void
 ZenServerInstance::CreateShutdownEvent(int BasePort)
 {
-	zen::ExtendableStringBuilder<32> ChildShutdownEventName;
+	ExtendableStringBuilder<32> ChildShutdownEventName;
 	ChildShutdownEventName << "Zen_" << BasePort;
 	ChildShutdownEventName << "_Shutdown";
-	zen::NamedEvent ChildShutdownEvent{ChildShutdownEventName};
+	NamedEvent ChildShutdownEvent{ChildShutdownEventName};
 	m_ShutdownEvent = std::move(ChildShutdownEvent);
 }