diff options
author | Max Kellermann <max@musicpd.org> | 2019-04-24 15:12:58 +0200 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2019-04-24 15:12:58 +0200 |
commit | 3fe7f27345ba5a1cc7cd9d1354f64e447e0c1caf (patch) | |
tree | bea006bc45ec435d0261ae52f8374d58f1c02d22 /src/sticker | |
parent | 0dccadff892231c4318c3573af9f9ce4fcae371e (diff) |
sticker/Database: eliminate sticker_foreach()
Diffstat (limited to 'src/sticker')
-rw-r--r-- | src/sticker/StickerDatabase.cxx | 10 | ||||
-rw-r--r-- | src/sticker/StickerDatabase.hxx | 13 | ||||
-rw-r--r-- | src/sticker/StickerPrint.cxx | 15 | ||||
-rw-r--r-- | src/sticker/StickerPrint.hxx | 2 |
4 files changed, 5 insertions, 35 deletions
diff --git a/src/sticker/StickerDatabase.cxx b/src/sticker/StickerDatabase.cxx index 9169fbdfc..4c1e2e883 100644 --- a/src/sticker/StickerDatabase.cxx +++ b/src/sticker/StickerDatabase.cxx @@ -314,16 +314,6 @@ sticker_delete_value(const char *type, const char *uri, const char *name) return modified; } -void -sticker_foreach(const Sticker &sticker, - void (*func)(const char *name, const char *value, - void *user_data), - void *user_data) -{ - for (const auto &i : sticker.table) - func(i.first.c_str(), i.second.c_str(), user_data); -} - Sticker sticker_load(const char *type, const char *uri) { diff --git a/src/sticker/StickerDatabase.hxx b/src/sticker/StickerDatabase.hxx index 583cb0c17..dbaac8080 100644 --- a/src/sticker/StickerDatabase.hxx +++ b/src/sticker/StickerDatabase.hxx @@ -109,19 +109,6 @@ bool sticker_delete_value(const char *type, const char *uri, const char *name); /** - * Iterates over all sticker items in a sticker. - * - * @param sticker the sticker object - * @param func a callback function - * @param user_data an opaque pointer for the callback function - */ -void -sticker_foreach(const Sticker &sticker, - void (*func)(const char *name, const char *value, - void *user_data), - void *user_data); - -/** * Loads the sticker for the specified resource. * * Throws #SqliteError on error. diff --git a/src/sticker/StickerPrint.cxx b/src/sticker/StickerPrint.cxx index d1e2bafc1..bd71bceb3 100644 --- a/src/sticker/StickerPrint.cxx +++ b/src/sticker/StickerPrint.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2003-2018 The Music Player Daemon Project + * Copyright 2003-2019 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ */ #include "StickerPrint.hxx" -#include "StickerDatabase.hxx" +#include "Sticker.hxx" #include "client/Response.hxx" void @@ -28,16 +28,9 @@ sticker_print_value(Response &r, r.Format("sticker: %s=%s\n", name, value); } -static void -print_sticker_cb(const char *name, const char *value, void *data) -{ - auto &r = *(Response *)data; - - sticker_print_value(r, name, value); -} - void sticker_print(Response &r, const Sticker &sticker) { - sticker_foreach(sticker, print_sticker_cb, &r); + for (const auto &i : sticker.table) + sticker_print_value(r, i.first.c_str(), i.second.c_str()); } diff --git a/src/sticker/StickerPrint.hxx b/src/sticker/StickerPrint.hxx index 77f70b3f2..b55eb5a68 100644 --- a/src/sticker/StickerPrint.hxx +++ b/src/sticker/StickerPrint.hxx @@ -1,5 +1,5 @@ /* - * Copyright 2003-2018 The Music Player Daemon Project + * Copyright 2003-2019 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify |