From 5b0d23d5532bc9a7289a739012abafbef94e205b Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 28 Dec 2018 17:14:27 +0100
Subject: [PATCH] output/httpd/IcyMetaDataServer: add `noexcept`
---
src/output/plugins/httpd/IcyMetaDataServer.cxx | 7 ++++---
src/output/plugins/httpd/IcyMetaDataServer.hxx | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/output/plugins/httpd/IcyMetaDataServer.cxx b/src/output/plugins/httpd/IcyMetaDataServer.cxx
index 2d1507ddb..df53278f7 100644
--- a/src/output/plugins/httpd/IcyMetaDataServer.cxx
+++ b/src/output/plugins/httpd/IcyMetaDataServer.cxx
@@ -29,7 +29,7 @@
AllocatedString<>
icy_server_metadata_header(const char *name,
const char *genre, const char *url,
- const char *content_type, int metaint)
+ const char *content_type, int metaint) noexcept
{
return FormatString("HTTP/1.1 200 OK\r\n"
"icy-notice1:<BR>This stream requires an audio player!<BR>\r\n" /* TODO */
@@ -54,7 +54,8 @@ icy_server_metadata_header(const char *name,
}
static AllocatedString<>
-icy_server_metadata_string(const char *stream_title, const char* stream_url)
+icy_server_metadata_string(const char *stream_title,
+ const char* stream_url) noexcept
{
// The leading n is a placeholder for the length information
auto icy_metadata = FormatString("nStreamTitle='%s';"
@@ -81,7 +82,7 @@ icy_server_metadata_string(const char *stream_title, const char* stream_url)
}
PagePtr
-icy_server_metadata_page(const Tag &tag, const TagType *types)
+icy_server_metadata_page(const Tag &tag, const TagType *types) noexcept
{
const char *tag_items[TAG_NUM_OF_ITEM_TYPES];
diff --git a/src/output/plugins/httpd/IcyMetaDataServer.hxx b/src/output/plugins/httpd/IcyMetaDataServer.hxx
index b060da4b6..ef07379e5 100644
--- a/src/output/plugins/httpd/IcyMetaDataServer.hxx
+++ b/src/output/plugins/httpd/IcyMetaDataServer.hxx
@@ -29,9 +29,9 @@ template<typename T> class AllocatedString;
AllocatedString<char>
icy_server_metadata_header(const char *name,
const char *genre, const char *url,
- const char *content_type, int metaint);
+ const char *content_type, int metaint) noexcept;
PagePtr
-icy_server_metadata_page(const Tag &tag, const TagType *types);
+icy_server_metadata_page(const Tag &tag, const TagType *types) noexcept;
#endif