From 0de42d56fc000eca07ee6c9cc750d391be994397 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 24 Apr 2014 18:09:39 +0200
Subject: DatabasePrint: eliminate printAllIn(), printInfoForAllIn()

---
 src/command/DatabaseCommands.cxx |  6 ++++--
 src/db/DatabasePrint.cxx         | 15 ---------------
 src/db/DatabasePrint.hxx         |  9 ---------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx
index 23ff593a4..d586067c1 100644
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -173,7 +173,8 @@ handle_listall(Client &client, gcc_unused int argc, char *argv[])
 		directory = argv[1];
 
 	Error error;
-	return printAllIn(client, directory, error)
+	return db_selection_print(client, DatabaseSelection(directory, true),
+				  false, false, error)
 		? CommandResult::OK
 		: print_error(client, error);
 }
@@ -253,7 +254,8 @@ handle_listallinfo(Client &client, gcc_unused int argc, char *argv[])
 		directory = argv[1];
 
 	Error error;
-	return printInfoForAllIn(client, directory, error)
+	return db_selection_print(client, DatabaseSelection(directory, true),
+				  true, false, error)
 		? CommandResult::OK
 		: print_error(client, error);
 }
diff --git a/src/db/DatabasePrint.cxx b/src/db/DatabasePrint.cxx
index 0e91db5d5..4693b8e08 100644
--- a/src/db/DatabasePrint.cxx
+++ b/src/db/DatabasePrint.cxx
@@ -216,21 +216,6 @@ searchStatsForSongsIn(Client &client, const char *name,
 	return true;
 }
 
-bool
-printAllIn(Client &client, const char *uri_utf8, Error &error)
-{
-	const DatabaseSelection selection(uri_utf8, true);
-	return db_selection_print(client, selection, false, false, error);
-}
-
-bool
-printInfoForAllIn(Client &client, const char *uri_utf8,
-		  Error &error)
-{
-	const DatabaseSelection selection(uri_utf8, true);
-	return db_selection_print(client, selection, true, false, error);
-}
-
 static bool
 PrintSongURIVisitor(Client &client, const LightSong &song)
 {
diff --git a/src/db/DatabasePrint.hxx b/src/db/DatabasePrint.hxx
index c4c719ca0..fd151684e 100644
--- a/src/db/DatabasePrint.hxx
+++ b/src/db/DatabasePrint.hxx
@@ -37,15 +37,6 @@ bool
 db_selection_print(Client &client, const DatabaseSelection &selection,
 		   bool full, bool base, Error &error);
 
-gcc_nonnull(2)
-bool
-printAllIn(Client &client, const char *uri_utf8, Error &error);
-
-gcc_nonnull(2)
-bool
-printInfoForAllIn(Client &client, const char *uri_utf8,
-		  Error &error);
-
 gcc_nonnull(2)
 bool
 searchStatsForSongsIn(Client &client, const char *name,
-- 
cgit v1.2.3