From 6f3c65dc647673e20960ba8546db25ae66898ede Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 2 Aug 2012 19:05:45 +0200 Subject: DatabaseGlue: remove db_walk(), db_visit() Unused. --- src/DatabaseGlue.cxx | 49 ------------------------------------------------- src/database.h | 12 ------------ 2 files changed, 61 deletions(-) (limited to 'src') diff --git a/src/DatabaseGlue.cxx b/src/DatabaseGlue.cxx index 0f946d3ed..a9b5e240a 100644 --- a/src/DatabaseGlue.cxx +++ b/src/DatabaseGlue.cxx @@ -124,55 +124,6 @@ db_get_song(const char *file) return db->GetSong(file, NULL); } -bool -db_visit(const struct db_selection *selection, - const struct db_visitor *visitor, void *ctx, - GError **error_r) -{ - if (db == NULL) { - g_set_error_literal(error_r, db_quark(), DB_DISABLED, - "No database"); - return false; - } - - VisitDirectory visit_directory; - if (visitor->directory != NULL) - visit_directory = [&](const struct directory *directory, - GError **error_r2) { - return visitor->directory(directory, ctx, error_r2); - }; - - VisitSong visit_song; - if (visitor->song != NULL) - visit_song = [&](struct song *song, GError **error_r2) { - return visitor->song(song, ctx, error_r2); - }; - - VisitPlaylist visit_playlist; - if (visitor->playlist != NULL) - visit_playlist = [&](const struct playlist_metadata *playlist, - const struct directory *directory, - GError **error_r2) { - return visitor->playlist(playlist, directory, ctx, - error_r2); - }; - - return db->Visit(selection, - visit_directory, visit_song, visit_playlist, - error_r); -} - -bool -db_walk(const char *uri, - const struct db_visitor *visitor, void *ctx, - GError **error_r) -{ - struct db_selection selection; - db_selection_init(&selection, uri, true); - - return db_visit(&selection, visitor, ctx, error_r); -} - bool db_save(GError **error_r) { diff --git a/src/database.h b/src/database.h index 47d52da65..20d132ea1 100644 --- a/src/database.h +++ b/src/database.h @@ -64,18 +64,6 @@ gcc_pure struct song * db_get_song(const char *file); -gcc_nonnull(1,2) -bool -db_visit(const struct db_selection *selection, - const struct db_visitor *visitor, void *ctx, - GError **error_r); - -gcc_nonnull(1,2) -bool -db_walk(const char *uri, - const struct db_visitor *visitor, void *ctx, - GError **error_r); - bool db_save(GError **error_r); -- cgit v1.2.3