From 30e3ef4c8ee9c0dd78a50e2c4489529381f7c137 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 26 Sep 2020 21:24:41 -0700 Subject: constexpr/std::array conversions Signed-off-by: Rosen Penev --- src/IdleFlags.cxx | 4 ++-- src/archive/plugins/Bzip2ArchivePlugin.cxx | 2 +- src/archive/plugins/Iso9660ArchivePlugin.cxx | 2 +- src/archive/plugins/ZzipArchivePlugin.cxx | 2 +- src/command/FileCommands.cxx | 6 +++--- src/decoder/plugins/WavpackDecoderPlugin.cxx | 4 ++-- src/playlist/plugins/FlacPlaylistPlugin.cxx | 2 +- src/playlist/plugins/PlsPlaylistPlugin.cxx | 4 ++-- src/playlist/plugins/RssPlaylistPlugin.cxx | 4 ++-- src/playlist/plugins/XspfPlaylistPlugin.cxx | 4 ++-- src/sticker/Database.cxx | 12 ++++++------ 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/IdleFlags.cxx b/src/IdleFlags.cxx index 74f01c032..12d197ef5 100644 --- a/src/IdleFlags.cxx +++ b/src/IdleFlags.cxx @@ -27,7 +27,7 @@ #include -static const char *const idle_names[] = { +static constexpr const char * idle_names[] = { "database", "stored_playlist", "playlist", @@ -42,7 +42,7 @@ static const char *const idle_names[] = { "neighbor", "mount", "partition", - nullptr + nullptr, }; const char*const* diff --git a/src/archive/plugins/Bzip2ArchivePlugin.cxx b/src/archive/plugins/Bzip2ArchivePlugin.cxx index e440007d3..3e9770a7c 100644 --- a/src/archive/plugins/Bzip2ArchivePlugin.cxx +++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx @@ -180,7 +180,7 @@ Bzip2InputStream::IsEOF() const noexcept /* exported structures */ -static const char *const bz2_extensions[] = { +static constexpr const char *bz2_extensions[] = { "bz2", nullptr }; diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx index 71f2ebb22..d8bcf2f07 100644 --- a/src/archive/plugins/Iso9660ArchivePlugin.cxx +++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx @@ -319,7 +319,7 @@ Iso9660InputStream::IsEOF() const noexcept /* exported structures */ -static const char *const iso9660_archive_extensions[] = { +static constexpr const char * iso9660_archive_extensions[] = { "iso", nullptr }; diff --git a/src/archive/plugins/ZzipArchivePlugin.cxx b/src/archive/plugins/ZzipArchivePlugin.cxx index dc6050d70..d56b1d8db 100644 --- a/src/archive/plugins/ZzipArchivePlugin.cxx +++ b/src/archive/plugins/ZzipArchivePlugin.cxx @@ -188,7 +188,7 @@ ZzipInputStream::Seek(std::unique_lock &, offset_type new_offset) /* exported structures */ -static const char *const zzip_archive_extensions[] = { +static constexpr const char *zzip_archive_extensions[] = { "zip", nullptr }; diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx index b5ad01f52..d7aed4445 100644 --- a/src/command/FileCommands.cxx +++ b/src/command/FileCommands.cxx @@ -156,14 +156,14 @@ handle_read_comments(Client &client, Request args, Response &r) static InputStreamPtr find_stream_art(std::string_view directory, Mutex &mutex) { - static constexpr char const * art_names[] = { + static constexpr auto art_names = std::array { "cover.png", "cover.jpg", "cover.tiff", - "cover.bmp" + "cover.bmp", }; - for(const auto name: art_names) { + for(const auto name : art_names) { std::string art_file = PathTraitsUTF8::Build(directory, name); try { diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx index 7723a1d56..b1a685851 100644 --- a/src/decoder/plugins/WavpackDecoderPlugin.cxx +++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx @@ -632,12 +632,12 @@ wavpack_scan_stream(InputStream &is, TagHandler &handler) return true; } -static char const *const wavpack_suffixes[] = { +static constexpr const char *wavpack_suffixes[] = { "wv", nullptr }; -static char const *const wavpack_mime_types[] = { +static constexpr const char *wavpack_mime_types[] = { "audio/x-wavpack", nullptr }; diff --git a/src/playlist/plugins/FlacPlaylistPlugin.cxx b/src/playlist/plugins/FlacPlaylistPlugin.cxx index ceda2292a..bc1af4d33 100644 --- a/src/playlist/plugins/FlacPlaylistPlugin.cxx +++ b/src/playlist/plugins/FlacPlaylistPlugin.cxx @@ -98,7 +98,7 @@ flac_playlist_open_stream(InputStreamPtr &&is) return nullptr; } -static const char *const flac_playlist_suffixes[] = { +static constexpr const char *flac_playlist_suffixes[] = { "flac", nullptr }; diff --git a/src/playlist/plugins/PlsPlaylistPlugin.cxx b/src/playlist/plugins/PlsPlaylistPlugin.cxx index 706a25c21..a488346bc 100644 --- a/src/playlist/plugins/PlsPlaylistPlugin.cxx +++ b/src/playlist/plugins/PlsPlaylistPlugin.cxx @@ -162,12 +162,12 @@ pls_open_stream(InputStreamPtr &&is) return std::make_unique(std::move(songs)); } -static const char *const pls_suffixes[] = { +static constexpr const char *pls_suffixes[] = { "pls", nullptr }; -static const char *const pls_mime_types[] = { +static constexpr const char *pls_mime_types[] = { "audio/x-scpls", nullptr }; diff --git a/src/playlist/plugins/RssPlaylistPlugin.cxx b/src/playlist/plugins/RssPlaylistPlugin.cxx index e1acbf87c..72675dad9 100644 --- a/src/playlist/plugins/RssPlaylistPlugin.cxx +++ b/src/playlist/plugins/RssPlaylistPlugin.cxx @@ -153,12 +153,12 @@ rss_open_stream(InputStreamPtr &&is) return std::make_unique(std::move(parser.songs)); } -static const char *const rss_suffixes[] = { +static constexpr const char *rss_suffixes[] = { "rss", nullptr }; -static const char *const rss_mime_types[] = { +static constexpr const char *rss_mime_types[] = { "application/rss+xml", "application/xml", "text/xml", diff --git a/src/playlist/plugins/XspfPlaylistPlugin.cxx b/src/playlist/plugins/XspfPlaylistPlugin.cxx index 92711c53d..d9b8ae7d7 100644 --- a/src/playlist/plugins/XspfPlaylistPlugin.cxx +++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx @@ -213,12 +213,12 @@ xspf_open_stream(InputStreamPtr &&is) return std::make_unique(std::move(parser.songs)); } -static const char *const xspf_suffixes[] = { +static constexpr const char *xspf_suffixes[] = { "xspf", nullptr }; -static const char *const xspf_mime_types[] = { +static constexpr const char *xspf_mime_types[] = { "application/xspf+xml", nullptr }; diff --git a/src/sticker/Database.cxx b/src/sticker/Database.cxx index a39cfc93a..196de6897 100644 --- a/src/sticker/Database.cxx +++ b/src/sticker/Database.cxx @@ -45,7 +45,7 @@ enum sticker_sql { STICKER_SQL_COUNT }; -static const char *const sticker_sql[] = { +static constexpr auto sticker_sql = std::array { //[STICKER_SQL_GET] = "SELECT value FROM sticker WHERE type=? AND uri=? AND name=?", //[STICKER_SQL_LIST] = @@ -71,7 +71,7 @@ static const char *const sticker_sql[] = { "SELECT uri,value FROM sticker WHERE type=? AND uri LIKE (? || '%') AND name=? AND value>?", }; -static const char sticker_sql_create[] = +static constexpr const char sticker_sql_create[] = "CREATE TABLE IF NOT EXISTS sticker(" " type VARCHAR NOT NULL, " " uri VARCHAR NOT NULL, " @@ -99,7 +99,7 @@ StickerDatabase::StickerDatabase(Path path) /* prepare the statements we're going to use */ - for (unsigned i = 0; i < std::size(sticker_sql); ++i) { + for (size_t i = 0; i < sticker_sql.size(); ++i) { assert(sticker_sql[i] != nullptr); stmt[i] = Prepare(db, sticker_sql[i]); @@ -110,10 +110,10 @@ StickerDatabase::~StickerDatabase() noexcept { assert(db != nullptr); - for (unsigned i = 0; i < std::size(stmt); ++i) { - assert(stmt[i] != nullptr); + for (const auto &sticker : stmt) { + assert(sticker != nullptr); - sqlite3_finalize(stmt[i]); + sqlite3_finalize(sticker); } } -- cgit v1.2.3