diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/lib/sqlite/Util.hxx | 80 | ||||
| -rw-r--r-- | src/sticker/StickerDatabase.cxx | 46 |
3 files changed, 82 insertions, 45 deletions
diff --git a/Makefile.am b/Makefile.am index 185fa6030..b9ee8d82f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -355,6 +355,7 @@ if ENABLE_SQLITE libmpd_a_SOURCES += \ src/command/StickerCommands.cxx src/command/StickerCommands.hxx \ src/lib/sqlite/Domain.cxx src/lib/sqlite/Domain.hxx \ + src/lib/sqlite/Util.hxx \ src/sticker/StickerDatabase.cxx src/sticker/StickerDatabase.hxx \ src/sticker/StickerPrint.cxx src/sticker/StickerPrint.hxx \ src/sticker/SongSticker.cxx src/sticker/SongSticker.hxx diff --git a/src/lib/sqlite/Util.hxx b/src/lib/sqlite/Util.hxx new file mode 100644 index 000000000..539a6653c --- /dev/null +++ b/src/lib/sqlite/Util.hxx @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2003-2014 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_SQLITE_UTIL_HXX +#define MPD_SQLITE_UTIL_HXX + +#include "Domain.hxx" +#include "Log.hxx" + +#include <sqlite3.h> + +#include <assert.h> + +static void +LogError(sqlite3 *db, const char *msg) +{ + FormatError(sqlite_domain, "%s: %s", msg, sqlite3_errmsg(db)); +} + +static void +LogError(sqlite3_stmt *stmt, const char *msg) +{ + LogError(sqlite3_db_handle(stmt), msg); +} + +static bool +Bind(sqlite3_stmt *stmt, unsigned i, const char *value) +{ + int result = sqlite3_bind_text(stmt, i, value, -1, nullptr); + if (result != SQLITE_OK) { + LogError(stmt, "sqlite3_bind_text() failed"); + return false; + } + + return true; +} + +template<typename... Args> +static bool +BindAll2(gcc_unused sqlite3_stmt *stmt, gcc_unused unsigned i) +{ + assert(int(i - 1) == sqlite3_bind_parameter_count(stmt)); + + return true; +} + +template<typename... Args> +static bool +BindAll2(sqlite3_stmt *stmt, unsigned i, const char *value, Args&&... args) +{ + return Bind(stmt, i, value) && + BindAll2(stmt, i + 1, std::forward<Args>(args)...); +} + +template<typename... Args> +static bool +BindAll(sqlite3_stmt *stmt, Args&&... args) +{ + assert(int(sizeof...(args)) == sqlite3_bind_parameter_count(stmt)); + + return BindAll2(stmt, 1, std::forward<Args>(args)...); +} + +#endif diff --git a/src/sticker/StickerDatabase.cxx b/src/sticker/StickerDatabase.cxx index 65d9617f4..54397cc9a 100644 --- a/src/sticker/StickerDatabase.cxx +++ b/src/sticker/StickerDatabase.cxx @@ -20,17 +20,16 @@ #include "config.h" #include "StickerDatabase.hxx" #include "lib/sqlite/Domain.hxx" +#include "lib/sqlite/Util.hxx" #include "fs/Path.hxx" #include "Idle.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include "util/Macros.hxx" #include "Log.hxx" #include <string> #include <map> -#include <sqlite3.h> #include <assert.h> struct sticker { @@ -78,14 +77,6 @@ static const char sticker_sql_create[] = static sqlite3 *sticker_db; static sqlite3_stmt *sticker_stmt[ARRAY_SIZE(sticker_sql)]; -static constexpr Domain sticker_domain("sticker"); - -static void -LogError(sqlite3 *db, const char *msg) -{ - FormatError(sticker_domain, "%s: %s", msg, sqlite3_errmsg(db)); -} - static sqlite3_stmt * sticker_prepare(const char *sql, Error &error) { @@ -165,41 +156,6 @@ sticker_enabled() return sticker_db != nullptr; } -static bool -Bind(sqlite3_stmt *stmt, unsigned i, const char *value) -{ - int result = sqlite3_bind_text(stmt, i, value, -1, nullptr); - if (result != SQLITE_OK) { - LogError(sticker_db, "sqlite3_bind_text() failed"); - return false; - } - - return true; -} - -template<typename... Args> -static bool -BindAll2(gcc_unused sqlite3_stmt *stmt, gcc_unused unsigned i) -{ - assert(int(i - 1) == sqlite3_bind_parameter_count(stmt)); - return true; -} - -template<typename... Args> -static bool -BindAll2(sqlite3_stmt *stmt, unsigned i, const char *value, Args&&... args) -{ - return Bind(stmt, i, value) && - BindAll2(stmt, i + 1, std::forward<Args>(args)...); -} - -template<typename... Args> -static bool -BindAll(sqlite3_stmt *stmt, Args&&... args) -{ - return BindAll2(stmt, 1, std::forward<Args>(args)...); -} - std::string sticker_load_value(const char *type, const char *uri, const char *name) { |