From cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 1 Feb 2014 00:26:34 +0100
Subject: Instance: add Database attribute

Move from db/DatabaseGlue.cxx, eliminating global variable.
---
 src/client/Client.cxx | 12 ++++++++++++
 src/client/Client.hxx |  6 ++++++
 2 files changed, 18 insertions(+)

(limited to 'src/client')

diff --git a/src/client/Client.cxx b/src/client/Client.cxx
index ce99faa89..c62c759e9 100644
--- a/src/client/Client.cxx
+++ b/src/client/Client.cxx
@@ -20,5 +20,17 @@
 #include "config.h"
 #include "ClientInternal.hxx"
 #include "util/Domain.hxx"
+#include "Partition.hxx"
+#include "Instance.hxx"
 
 const Domain client_domain("client");
+
+#ifdef ENABLE_DATABASE
+
+const Database *
+Client::GetDatabase(Error &error) const
+{
+	return partition.instance.GetDatabase(error);
+}
+
+#endif
diff --git a/src/client/Client.hxx b/src/client/Client.hxx
index 708b0d03d..006ffc98c 100644
--- a/src/client/Client.hxx
+++ b/src/client/Client.hxx
@@ -38,6 +38,7 @@ struct sockaddr;
 class EventLoop;
 class Path;
 struct Partition;
+class Database;
 
 class Client final : private FullyBufferedSocket, TimeoutMonitor {
 public:
@@ -169,6 +170,11 @@ public:
 	 */
 	bool AllowFile(Path path_fs, Error &error) const;
 
+	/**
+	 * Wrapper for Instance::GetDatabase().
+	 */
+	const Database *GetDatabase(Error &error) const;
+
 private:
 	/* virtual methods from class BufferedSocket */
 	virtual InputResult OnSocketInput(void *data, size_t length) override;
-- 
cgit v1.2.3