From bdd316749514c353d7d46812f60c8dfa46b97f13 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Sat, 18 Jan 2020 19:50:40 +0100
Subject: [PATCH] tag/ApeLoader: remove exception handler, let caller catch

---
 src/tag/ApeLoader.hxx     | 2 ++
 src/tag/ApeReplayGain.hxx | 3 +++
 src/tag/ApeTag.cxx        | 2 +-
 src/tag/ApeTag.hxx        | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/tag/ApeLoader.hxx b/src/tag/ApeLoader.hxx
index 8c4f4e2a4..76f34e43b 100644
--- a/src/tag/ApeLoader.hxx
+++ b/src/tag/ApeLoader.hxx
@@ -31,6 +31,8 @@ typedef std::function<bool(unsigned long flags, const char *key,
 /**
  * Scans the APE tag values from a file.
  *
+ * Throws on I/O error.
+ *
  * @return false if the file could not be opened or if no APE tag is
  * present
  */
diff --git a/src/tag/ApeReplayGain.hxx b/src/tag/ApeReplayGain.hxx
index d08fa835f..451a65b23 100644
--- a/src/tag/ApeReplayGain.hxx
+++ b/src/tag/ApeReplayGain.hxx
@@ -23,6 +23,9 @@
 class InputStream;
 struct ReplayGainInfo;
 
+/**
+ * Throws on I/O error.
+ */
 bool
 replay_gain_ape_read(InputStream &is, ReplayGainInfo &info);
 
diff --git a/src/tag/ApeTag.cxx b/src/tag/ApeTag.cxx
index 179cef416..aec22cdee 100644
--- a/src/tag/ApeTag.cxx
+++ b/src/tag/ApeTag.cxx
@@ -68,7 +68,7 @@ tag_ape_import_item(unsigned long flags,
 }
 
 bool
-tag_ape_scan2(InputStream &is, TagHandler &handler) noexcept
+tag_ape_scan2(InputStream &is, TagHandler &handler)
 {
 	bool recognized = false;
 
diff --git a/src/tag/ApeTag.hxx b/src/tag/ApeTag.hxx
index 721ce6f89..a0edc0a43 100644
--- a/src/tag/ApeTag.hxx
+++ b/src/tag/ApeTag.hxx
@@ -26,9 +26,11 @@ class TagHandler;
 /**
  * Scan the APE tags of a stream.
  *
+ * Throws on I/O error.
+ *
  * @param path_fs the path of the file in filesystem encoding
  */
 bool
-tag_ape_scan2(InputStream &is, TagHandler &handler) noexcept;
+tag_ape_scan2(InputStream &is, TagHandler &handler);
 
 #endif