From c88d5616f70819ce6e09255aeacc9153f58a56ec Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 25 Apr 2019 11:57:29 +0200
Subject: [PATCH] sticker/Database: move sticker_prepare() to
 lib/sqlite/Util.hxx

---
 src/lib/sqlite/Util.hxx  | 12 ++++++++++++
 src/sticker/Database.cxx | 14 +-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lib/sqlite/Util.hxx b/src/lib/sqlite/Util.hxx
index 4a6ccedeb..f0d1544c8 100644
--- a/src/lib/sqlite/Util.hxx
+++ b/src/lib/sqlite/Util.hxx
@@ -28,6 +28,18 @@
 
 namespace Sqlite {
 
+static inline sqlite3_stmt *
+Prepare(sqlite3 *db, const char *sql)
+{
+	sqlite3_stmt *stmt;
+	int ret = sqlite3_prepare_v2(db, sql, -1, &stmt, nullptr);
+	if (ret != SQLITE_OK)
+		throw SqliteError(db, ret,
+				  "sqlite3_prepare_v2() failed");
+
+	return stmt;
+}
+
 /**
  * Throws #SqliteError on error.
  */
diff --git a/src/sticker/Database.cxx b/src/sticker/Database.cxx
index 6ed64316b..5e5f341c5 100644
--- a/src/sticker/Database.cxx
+++ b/src/sticker/Database.cxx
@@ -83,18 +83,6 @@ static const char sticker_sql_create[] =
 static sqlite3 *sticker_db;
 static sqlite3_stmt *sticker_stmt[ARRAY_SIZE(sticker_sql)];
 
-static sqlite3_stmt *
-sticker_prepare(const char *sql)
-{
-	sqlite3_stmt *stmt;
-	int ret = sqlite3_prepare_v2(sticker_db, sql, -1, &stmt, nullptr);
-	if (ret != SQLITE_OK)
-		throw SqliteError(sticker_db, ret,
-				  "sqlite3_prepare_v2() failed");
-
-	return stmt;
-}
-
 void
 sticker_global_init(Path path)
 {
@@ -125,7 +113,7 @@ sticker_global_init(Path path)
 	for (unsigned i = 0; i < ARRAY_SIZE(sticker_sql); ++i) {
 		assert(sticker_sql[i] != nullptr);
 
-		sticker_stmt[i] = sticker_prepare(sticker_sql[i]);
+		sticker_stmt[i] = Prepare(sticker_db, sticker_sql[i]);
 	}
 }