replace assert.h with cassert

src/IcyMetaDataParser.cxx

@@ -23,8 +23,8 @@
 #include "util/StringView.hxx"
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <string.h>
 
 #ifdef HAVE_ICU_CONVERTER

src/Idle.cxx

@@ -26,7 +26,7 @@
 #include "Main.hxx"
 #include "Instance.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 idle_add(unsigned flags)

src/IdleFlags.cxx

@@ -25,7 +25,7 @@
 #include "IdleFlags.hxx"
 #include "util/ASCII.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static const char *const idle_names[] = {
 	"database",

src/LogBackend.cxx

@@ -23,7 +23,8 @@
 #include "util/StringStrip.hxx"
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdio.h>
 #include <string.h>
 #include <time.h>

src/LogInit.cxx

@@ -30,11 +30,12 @@
 #include "util/RuntimeError.hxx"
 #include "system/Error.hxx"
 
+#include <cassert>
+
 #ifdef ENABLE_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>
 #endif
 
-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 #include <stdio.h>

src/Mapper.cxx

@@ -33,7 +33,7 @@
 #include "Main.hxx"
 #endif
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * The absolute path of the playlist directory encoded in the

src/MusicBuffer.cxx

@@ -20,7 +20,7 @@
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 MusicBuffer::MusicBuffer(unsigned num_chunks)
 	:buffer(num_chunks) {

src/MusicChunk.cxx

@@ -21,7 +21,7 @@
 #include "pcm/AudioFormat.hxx"
 #include "tag/Tag.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 MusicChunkInfo::MusicChunkInfo() noexcept = default;
 MusicChunkInfo::~MusicChunkInfo() noexcept = default;

src/MusicPipe.cxx

@@ -20,7 +20,7 @@
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 #ifndef NDEBUG
 

src/Permission.cxx

@@ -26,11 +26,11 @@
 #include "util/RuntimeError.hxx"
 #include "util/StringView.hxx"
 
+#include <cassert>
 #include <map>
 #include <string>
 #include <utility>
 
-#include <assert.h>
 #include <string.h>
 
 static constexpr char PERMISSION_PASSWORD_CHAR = '@';

src/PlaylistFile.cxx

@@ -42,7 +42,8 @@
 #include "util/StringCompare.hxx"
 #include "util/UriExtract.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static const char PLAYLIST_COMMENT = '#';

src/ReplayGainGlobal.cxx

@@ -21,9 +21,9 @@
 #include "ReplayGainConfig.hxx"
 #include "config/Data.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <stdlib.h>
 #include <math.h>
 

src/ReplayGainMode.cxx

@@ -19,9 +19,9 @@
 
 #include "ReplayGainMode.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 const char *

src/SingleMode.cxx

@@ -19,9 +19,9 @@
 
 #include "SingleMode.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 const char *

src/SongLoader.cxx

@@ -26,7 +26,7 @@
 #include "PlaylistError.hxx"
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #ifdef ENABLE_DATABASE
 

src/SongUpdate.cxx

@@ -34,7 +34,8 @@
 #include "TagArchive.hxx"
 #endif
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 #ifdef ENABLE_DATABASE

src/TagFile.cxx

@@ -27,7 +27,7 @@
 #include "input/InputStream.hxx"
 #include "input/LocalOpen.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 class TagFileScan {
 	const Path path_fs;

src/TagStream.cxx

@@ -28,7 +28,7 @@
 #include "thread/Mutex.hxx"
 #include "util/UriExtract.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * Does the #DecoderPlugin support either the suffix or the MIME type?

src/archive/ArchiveList.cxx

@@ -25,9 +25,9 @@
 #include "plugins/Iso9660ArchivePlugin.hxx"
 #include "plugins/ZzipArchivePlugin.hxx"
 
+#include <cassert>
 #include <iterator>
 
-#include <assert.h>
 #include <string.h>
 
 const ArchivePlugin *const archive_plugins[] = {

src/archive/ArchivePlugin.cxx

@@ -21,7 +21,7 @@
 #include "ArchiveFile.hxx"
 #include "fs/Path.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 std::unique_ptr<ArchiveFile>
 archive_file_open(const ArchivePlugin *plugin, Path path)

src/client/Idle.cxx

@@ -22,7 +22,7 @@
 #include "Response.hxx"
 #include "Idle.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static void
 WriteIdleResponse(Response &r, unsigned flags) noexcept

src/client/List.cxx

@@ -20,7 +20,7 @@
 #include "List.hxx"
 #include "util/DeleteDisposer.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 ClientList::~ClientList() noexcept
 {

src/client/New.cxx

@@ -29,7 +29,7 @@
 #include "net/ToString.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
 

src/client/Subscribe.cxx

@@ -21,7 +21,7 @@
 #include "Partition.hxx"
 #include "IdleFlags.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 Client::SubscribeResult
 Client::Subscribe(const char *channel) noexcept

src/command/AllCommands.cxx

@@ -48,9 +48,9 @@
 #include "StickerCommands.hxx"
 #endif
 
+#include <cassert>
 #include <iterator>
 
-#include <assert.h>
 #include <string.h>
 
 /*

src/command/CommandListBuilder.hxx

@@ -20,11 +20,10 @@
 #ifndef MPD_COMMAND_LIST_BUILDER_HXX
 #define MPD_COMMAND_LIST_BUILDER_HXX
 
+#include <cassert>
 #include <list>
 #include <string>
 
-#include <assert.h>
-
 class CommandListBuilder {
 	/**
 	 * print OK after each command execution

src/command/FileCommands.cxx

@@ -43,7 +43,8 @@
 #include "thread/Mutex.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <inttypes.h> /* for PRIu64 */
 
 gcc_pure

src/command/MessageCommands.cxx

@@ -25,11 +25,10 @@
 #include "util/ConstBuffer.hxx"
 #include "Partition.hxx"
 
+#include <cassert>
 #include <set>
 #include <string>
 
-#include <assert.h>
-
 CommandResult
 handle_subscribe(Client &client, Request args, Response &r)
 {

src/command/OtherCommands.cxx

@@ -55,7 +55,7 @@
 #include "db/update/Service.hxx"
 #endif
 
-#include <assert.h>
+#include <cassert>
 
 static void
 print_spl_list(Response &r, const PlaylistVector &list)

src/command/Request.hxx

@@ -25,10 +25,9 @@
 #include "Chrono.hxx"
 #include "util/ConstBuffer.hxx"
 
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
-
 class Response;
 
 class Request : public ConstBuffer<const char *> {

src/config/File.cxx

@@ -35,7 +35,7 @@
 #include "fs/io/BufferedReader.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr char CONF_COMMENT = '#';
 

src/config/Path.cxx

@@ -24,7 +24,8 @@
 #include "fs/StandardDirectory.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 #ifndef _WIN32

src/db/DatabaseLock.hxx

@@ -29,7 +29,7 @@
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
 
-#include <assert.h>
+#include <cassert>
 
 extern Mutex db_mutex;
 

src/db/DatabaseSong.cxx

@@ -26,7 +26,7 @@
 #include "util/UriExtract.hxx"
 #include "util/UriRelative.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 DetachedSong
 DatabaseDetachSong(const Storage *storage, const LightSong &song) noexcept

src/db/PlaylistVector.cxx

@@ -21,8 +21,7 @@
 #include "db/DatabaseLock.hxx"
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 PlaylistVector::iterator
 PlaylistVector::find(const char *name) noexcept

src/db/VHelper.cxx

@@ -23,9 +23,9 @@
 #include "song/Filter.hxx"
 
 #include <algorithm>
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 

src/db/plugins/simple/Directory.cxx

@@ -33,7 +33,8 @@
 #include "util/Alloc.hxx"
 #include "util/DeleteDisposer.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdlib.h>
 

src/db/plugins/upnp/UpnpDatabasePlugin.cxx

@@ -40,10 +40,10 @@
 #include "util/RecursiveMap.hxx"
 #include "util/SplitString.hxx"
 
+#include <cassert>
 #include <string>
 #include <utility>
 
-#include <assert.h>
 #include <string.h>
 
 static const char *const rootid = "0";

src/db/update/Editor.cxx

@@ -24,7 +24,7 @@
 #include "db/plugins/simple/Directory.hxx"
 #include "db/plugins/simple/Song.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 DatabaseEditor::DeleteSong(Directory &dir, Song *del)

src/db/update/ExcludeList.cxx

@@ -29,7 +29,7 @@
 #include "util/StringStrip.hxx"
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #ifdef HAVE_CLASS_GLOB
 

src/db/update/InotifyUpdate.cxx

@@ -27,11 +27,11 @@
 #include "fs/Traits.hxx"
 #include "Log.hxx"
 
-#include <string>
-#include <map>
+#include <cassert>
 #include <forward_list>
+#include <map>
+#include <string>
 
-#include <assert.h>
 #include <sys/inotify.h>
 #include <string.h>
 #include <dirent.h>

src/db/update/Service.cxx

@@ -36,7 +36,7 @@
 #include "event/Loop.hxx"
 #endif
 
-#include <assert.h>
+#include <cassert>
 
 UpdateService::UpdateService(const ConfigData &_config,
 			     EventLoop &_loop, SimpleDatabase &_db,

src/db/update/Walk.cxx

@@ -38,10 +38,10 @@
 #include "util/UriExtract.hxx"
 #include "Log.hxx"
 
+#include <cassert>
 #include <exception>
 #include <memory>
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>

src/decoder/Bridge.cxx

@@ -36,7 +36,8 @@
 #include "util/ConstBuffer.hxx"
 #include "util/StringBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <math.h>
 

src/decoder/Control.cxx

@@ -21,10 +21,9 @@
 #include "MusicPipe.hxx"
 #include "song/DetachedSong.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
-
 DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond,
 			       InputCacheManager *_input_cache,
 			       const AudioFormat _configured_audio_format,

src/decoder/Control.hxx

@@ -31,11 +31,11 @@
 #include "ReplayGainConfig.hxx"
 #include "ReplayGainMode.hxx"
 
+#include <cassert>
 #include <exception>
-#include <utility>
 #include <memory>
+#include <utility>
 
-#include <assert.h>
 #include <stdint.h>
 
 /* damn you, windows.h! */

src/decoder/DecoderAPI.cxx

@@ -21,7 +21,7 @@
 #include "input/InputStream.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 size_t
 decoder_read(DecoderClient *client,

src/decoder/DecoderPlugin.cxx

@@ -20,7 +20,7 @@
 #include "DecoderPlugin.hxx"
 #include "util/StringUtil.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 bool
 DecoderPlugin::SupportsSuffix(const char *suffix) const noexcept

src/decoder/DecoderPrint.cxx

@@ -22,10 +22,9 @@
 #include "DecoderPlugin.hxx"
 #include "client/Response.hxx"
 
+#include <cassert>
 #include <functional>
 
-#include <assert.h>
-
 static void
 decoder_plugin_print(Response &r,
 		     const DecoderPlugin &plugin)

src/decoder/plugins/AdPlugDecoderPlugin.cxx

@@ -29,7 +29,7 @@
 #include <adplug/adplug.h>
 #include <adplug/emuopl.h>
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr Domain adplug_domain("adplug");
 

src/decoder/plugins/AudiofileDecoderPlugin.cxx

@@ -29,9 +29,9 @@
 #include <audiofile.h>
 #include <af_vfs.h>
 
+#include <cassert>
 #include <exception>
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 

src/decoder/plugins/FaadDecoderPlugin.cxx

@@ -30,9 +30,9 @@
 
 #include <neaacdec.h>
 
+#include <cassert>
 #include <cmath>
 
-#include <assert.h>
 #include <string.h>
 
 static const unsigned adts_sample_rates[] =

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -52,7 +52,8 @@ extern "C" {
 #include <libavutil/frame.h>
 }
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 /**

src/decoder/plugins/FlacPcm.cxx

@@ -23,7 +23,7 @@
 #include "util/RuntimeError.hxx"
 #include "util/ConstBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample,

src/decoder/plugins/FlacStreamDecoder.hxx

@@ -22,10 +22,9 @@
 
 #include <FLAC/stream_decoder.h>
 
-#include <utility>
+#include <cassert>
 #include <stdexcept>
-
-#include <assert.h>
+#include <utility>
 
 /**
  * OO wrapper for a FLAC__StreamDecoder.

src/decoder/plugins/GmeDecoderPlugin.cxx

@@ -37,7 +37,8 @@
 
 #include <gme/gme.h>
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 #include <string.h>
 

src/decoder/plugins/MadDecoderPlugin.cxx

@@ -39,7 +39,8 @@
 #include <id3tag.h>
 #endif
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/decoder/plugins/MikmodDecoderPlugin.cxx

@@ -29,7 +29,7 @@
 
 #include <mikmod.h>
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr Domain mikmod_domain("mikmod");
 

src/decoder/plugins/ModplugDecoderPlugin.cxx

@@ -29,8 +29,7 @@
 
 #include <libmodplug/modplug.h>
 
-
-#include <assert.h>
+#include <cassert>
 
 static constexpr Domain modplug_domain("modplug");
 

src/decoder/plugins/WavpackDecoderPlugin.cxx

@@ -31,13 +31,11 @@
 #include <wavpack/wavpack.h>
 
 #include <algorithm>
+#include <cassert>
+#include <cstdlib>
 #include <iterator>
 #include <memory>
 
-#include <cstdlib>
-
-#include <assert.h>
-
 #define ERRORLEN 80
 
 #ifdef OPEN_DSD_AS_PCM

src/encoder/EncoderInterface.hxx

@@ -23,7 +23,8 @@
 #include "EncoderPlugin.hxx"
 #include "util/Compiler.h"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stddef.h>
 
 struct AudioFormat;

src/encoder/plugins/LameEncoderPlugin.cxx

@@ -26,9 +26,9 @@
 
 #include <lame/lame.h>
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 class LameEncoder final : public Encoder {

src/encoder/plugins/OpusEncoderPlugin.cxx

@@ -26,9 +26,9 @@
 #include <opus.h>
 #include <ogg/ogg.h>
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <stdlib.h>
 
 namespace {

src/encoder/plugins/TwolameEncoderPlugin.cxx

@@ -27,9 +27,9 @@
 
 #include <twolame.h>
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 class TwolameEncoder final : public Encoder {

src/encoder/plugins/WaveEncoderPlugin.cxx

@@ -22,7 +22,8 @@
 #include "util/ByteOrder.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static constexpr uint16_t WAVE_FORMAT_PCM = 1;

src/event/BufferedSocket.hxx

@@ -23,9 +23,9 @@
 #include "SocketMonitor.hxx"
 #include "util/StaticFifoBuffer.hxx"
 
+#include <cassert>
 #include <exception>
 
-#include <assert.h>
 #include <stdint.h>
 
 class EventLoop;

src/event/Call.cxx

@@ -23,10 +23,9 @@
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
 
+#include <cassert>
 #include <exception>
 
-#include <assert.h>
-
 class BlockingCallMonitor final
 {
 	DeferEvent defer_event;

src/event/FullyBufferedSocket.cxx

@@ -21,7 +21,8 @@
 #include "net/SocketError.hxx"
 #include "util/Compiler.h"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 FullyBufferedSocket::ssize_t

src/event/IdleMonitor.cxx

@@ -20,7 +20,7 @@
 #include "IdleMonitor.hxx"
 #include "Loop.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 IdleMonitor::Cancel() noexcept

src/event/Loop.hxx

@@ -34,10 +34,9 @@
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/list.hpp>
 
-#include <chrono>
 #include <atomic>
-
-#include <assert.h>
+#include <cassert>
+#include <chrono>
 
 /**
  * An event loop that polls for events on file/socket descriptors.

src/event/MultiSocketMonitor.hxx

@@ -24,11 +24,10 @@
 #include "TimerEvent.hxx"
 #include "SocketMonitor.hxx"
 
+#include <cassert>
 #include <forward_list>
 #include <iterator>
 
-#include <assert.h>
-
 #ifndef _WIN32
 struct pollfd;
 #endif

src/event/PollGroupPoll.cxx

@@ -23,7 +23,7 @@
 
 #include "PollGroupPoll.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 PollGroupPoll::PollGroupPoll() noexcept = default;
 PollGroupPoll::~PollGroupPoll() noexcept = default;

src/event/PollGroupWinSelect.hxx

@@ -22,11 +22,11 @@
 
 #include "PollResultGeneric.hxx"
 
-#include <assert.h>
-#include <string.h>
-
+#include <cassert>
 #include <unordered_map>
 
+#include <string.h>
+
 #include <windows.h>
 #include <winsock2.h>
 

src/event/ServerSocket.cxx

@@ -35,11 +35,10 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
+#include <cassert>
 #include <string>
 #include <utility>
 
-#include <assert.h>
-
 #ifdef HAVE_UN
 #include <sys/stat.h>
 #endif

src/event/SignalMonitor.cxx

@@ -37,12 +37,12 @@
 #endif
 
 #include <algorithm>
+#include <cassert>
 
 #ifdef USE_SIGNALFD
 #include <pthread.h>
 #endif
 
-#include <assert.h>
 #include <signal.h>
 
 class SignalMonitor final : private SocketMonitor {

src/event/SocketMonitor.cxx

@@ -20,10 +20,9 @@
 #include "SocketMonitor.hxx"
 #include "Loop.hxx"
 
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
-
 void
 SocketMonitor::Dispatch(unsigned flags) noexcept
 {

src/event/SocketMonitor.hxx

@@ -23,9 +23,9 @@
 #include "PollGroup.hxx"
 #include "net/SocketDescriptor.hxx"
 
+#include <cassert>
 #include <type_traits>
 
-#include <assert.h>
 #include <stddef.h>
 
 class EventLoop;

src/filter/Filter.hxx

@@ -22,7 +22,7 @@
 
 #include "pcm/AudioFormat.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 template<typename T> struct ConstBuffer;
 

src/filter/Observer.cxx

@@ -22,7 +22,7 @@
 #include "Prepared.hxx"
 #include "util/ConstBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 class FilterObserver::PreparedProxy final : public PreparedFilter {
 	FilterObserver &observer;

src/filter/plugins/AutoConvertFilterPlugin.cxx

@@ -24,10 +24,9 @@
 #include "pcm/AudioFormat.hxx"
 #include "util/ConstBuffer.hxx"
 
+#include <cassert>
 #include <memory>
 
-#include <assert.h>
-
 class AutoConvertFilter final : public Filter {
 	/**
 	 * The underlying filter.

src/filter/plugins/ChainFilterPlugin.cxx

@@ -25,10 +25,9 @@
 #include "util/StringBuffer.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <memory>
+#include <cassert>
 #include <list>
-
-#include <assert.h>
+#include <memory>
 
 class ChainFilter final : public Filter {
 	struct Child {

src/filter/plugins/ConvertFilterPlugin.cxx

@@ -24,10 +24,9 @@
 #include "pcm/Convert.hxx"
 #include "util/ConstBuffer.hxx"
 
+#include <cassert>
 #include <memory>
 
-#include <assert.h>
-
 class ConvertFilter final : public Filter {
 	/**
 	 * The input audio format; PCM data is passed to the filter()

src/filter/plugins/ReplayGainFilterPlugin.cxx

@@ -29,10 +29,9 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
+#include <cassert>
 #include <exception>
 
-#include <assert.h>
-
 static constexpr Domain replay_gain_domain("replay_gain");
 
 class ReplayGainFilter final : public Filter {

src/fs/Charset.cxx

@@ -31,8 +31,7 @@
 #endif
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 #ifdef HAVE_FS_CHARSET
 

src/fs/Path.hxx

@@ -23,10 +23,9 @@
 #include "util/Compiler.h"
 #include "Traits.hxx"
 
+#include <cassert>
 #include <string>
 
-#include <assert.h>
-
 class AllocatedPath;
 
 /**

src/fs/Traits.hxx

@@ -29,10 +29,9 @@
 #include <tchar.h>
 #endif
 
+#include <cassert>
 #include <string>
 
-#include <assert.h>
-
 #ifdef _WIN32
 #define PATH_LITERAL(s) _T(s)
 #else

src/fs/io/FileOutputStream.hxx

@@ -38,7 +38,8 @@
 #include "system/FileDescriptor.hxx"
 #endif
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdint.h>
 
 #ifdef _WIN32

src/fs/io/FileReader.cxx

@@ -32,7 +32,7 @@
 #include "system/Error.hxx"
 #include "system/Open.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 #ifdef _WIN32
 

src/fs/io/PeekReader.cxx

@@ -20,8 +20,8 @@
 #include "PeekReader.hxx"
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <string.h>
 
 const void *

src/fs/io/TextFile.cxx

@@ -23,7 +23,7 @@
 #include "BufferedReader.hxx"
 #include "fs/Path.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 TextFile::TextFile(Path path_fs)
 	:file_reader(std::make_unique<FileReader>(path_fs)),

src/input/AsyncInputStream.cxx

@@ -23,9 +23,9 @@
 #include "thread/Cond.hxx"
 #include "event/Loop.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 AsyncInputStream::AsyncInputStream(EventLoop &event_loop, const char *_url,

src/input/BufferedInputStream.hxx

@@ -23,7 +23,7 @@
 #include "InputStream.hxx"
 #include "BufferingInputStream.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * A "huge" buffer which remembers the (partial) contents of an

src/input/Init.cxx

@@ -27,10 +27,9 @@
 #include "PluginUnavailable.hxx"
 #include "util/RuntimeError.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
-
 void
 input_stream_global_init(const ConfigData &config, EventLoop &event_loop)
 {

src/input/InputPlugin.cxx

@@ -20,8 +20,8 @@
 #include "InputPlugin.hxx"
 #include "util/StringCompare.hxx"
 
-#include <assert.h>
 #include <algorithm>
+#include <cassert>
 #include <iterator>
 
 bool
@@ -71,4 +71,4 @@ protocol_is_whitelisted(const char *proto) {
 	return std::binary_search(begin, end, proto, [](const char* a, const char* b) {
 		return strcasecmp(a,b) < 0;
 	});
-}
\ No newline at end of file
+}

src/input/InputPlugin.hxx

@@ -23,7 +23,8 @@
 #include "Ptr.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
-#include <assert.h>
+
+#include <cassert>
 #include <set>
 #include <string>
 

src/input/InputStream.cxx

@@ -22,10 +22,9 @@
 #include "tag/Tag.hxx"
 #include "util/ASCII.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
-
 InputStream::~InputStream() noexcept = default;
 
 void

src/input/InputStream.hxx

@@ -25,10 +25,9 @@
 #include "thread/Mutex.hxx"
 #include "util/Compiler.h"
 
-#include <string>
+#include <cassert>
 #include <memory>
-
-#include <assert.h>
+#include <string>
 
 struct Tag;
 class InputStreamHandler;

src/input/LocalOpen.cxx

@@ -29,7 +29,7 @@
 #include "fs/Path.hxx"
 #include "system/Error.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 InputStreamPtr
 OpenLocalInputStream(Path path, Mutex &mutex)

src/input/RewindInputStream.cxx

@@ -20,7 +20,8 @@
 #include "RewindInputStream.hxx"
 #include "ProxyInputStream.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 class RewindInputStream final : public ProxyInputStream {

src/input/TextInputStream.cxx

@@ -21,7 +21,7 @@
 #include "InputStream.hxx"
 #include "util/TextFile.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 TextInputStream::TextInputStream(InputStreamPtr &&_is) noexcept
 	:is(std::move(_is)) {}

src/input/ThreadInputStream.cxx

@@ -21,7 +21,8 @@
 #include "CondHandler.hxx"
 #include "thread/Name.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 ThreadInputStream::ThreadInputStream(const char *_plugin,

src/input/ThreadInputStream.hxx

@@ -26,9 +26,9 @@
 #include "util/HugeAllocator.hxx"
 #include "util/CircularBuffer.hxx"
 
+#include <cassert>
 #include <exception>
 
-#include <assert.h>
 #include <stdint.h>
 
 /**

src/input/cache/Item.cxx

@@ -21,7 +21,7 @@
 #include "Lease.hxx"
 #include "input/InputStream.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 InputCacheItem::InputCacheItem(InputStreamPtr _input) noexcept
 	:BufferingInputStream(std::move(_input)),

src/input/plugins/AlsaInputPlugin.cxx

@@ -43,7 +43,8 @@
 
 #include <alsa/asoundlib.h>
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static constexpr Domain alsa_input_domain("alsa");

src/input/plugins/CdioParanoiaInputPlugin.cxx

@@ -34,11 +34,12 @@
 #include "Log.hxx"
 #include "config/Block.hxx"
 
+#include <cassert>
+
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #include <cdio/cd_types.h>
 

src/input/plugins/CurlInputPlugin.cxx

@@ -49,9 +49,9 @@
 #include "util/UriQueryParser.hxx"
 #endif
 
+#include <cassert>
 #include <cinttypes>
 
-#include <assert.h>
 #include <string.h>
 
 #include <curl/curl.h>

src/input/plugins/QobuzClient.cxx

@@ -21,10 +21,9 @@
 #include "lib/crypto/MD5.hxx"
 #include "util/ConstBuffer.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
-
 namespace {
 
 class QueryStringBuilder {

src/java/Class.hxx

@@ -33,7 +33,7 @@
 #include "Ref.hxx"
 #include "Exception.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 namespace Java {
 	/**

src/java/Object.hxx

@@ -34,7 +34,7 @@
 
 #include <jni.h>
 
-#include <assert.h>
+#include <cassert>
 
 namespace Java {
 	/**

src/java/Ref.hxx

@@ -34,10 +34,9 @@
 
 #include <jni.h>
 
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
-
 namespace Java {
 	/**
 	 * Hold a local reference on a JNI object.

src/lib/alsa/Format.hxx

@@ -26,7 +26,7 @@
 
 #include <alsa/asoundlib.h>
 
-#include <assert.h>
+#include <cassert>
 
 #if SND_LIB_VERSION >= 0x1001c
 /* alsa-lib supports DSD since version 1.0.27.1 */

src/lib/alsa/PeriodBuffer.hxx

@@ -23,8 +23,8 @@
 #include <alsa/asoundlib.h>
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <stdint.h>
 
 namespace Alsa {

src/lib/curl/Delegate.cxx

@@ -30,10 +30,9 @@
 #include "Delegate.hxx"
 #include "Parser.hxx"
 
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
-
 void
 DelegateCurlResponseHandler::OnHeaders(unsigned status,
 				       std::multimap<std::string, std::string> &&headers)

src/lib/curl/Global.cxx

@@ -35,7 +35,7 @@
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr Domain curlm_domain("curlm");
 

src/lib/curl/Init.cxx

@@ -32,7 +32,7 @@
 #include "event/Call.hxx"
 #include "thread/Mutex.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 Mutex CurlInit::mutex;
 unsigned CurlInit::ref;

src/lib/curl/Request.cxx

@@ -40,8 +40,8 @@
 #include <curl/curl.h>
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <string.h>
 
 CurlRequest::CurlRequest(CurlGlobal &_global,

src/lib/dbus/AsyncRequest.hxx

@@ -33,10 +33,9 @@
 #include "PendingCall.hxx"
 #include "Message.hxx"
 
+#include <cassert>
 #include <functional>
 
-#include <assert.h>
-
 namespace ODBus {
 
 /**

src/lib/ffmpeg/Time.hxx

@@ -28,7 +28,8 @@ extern "C" {
 #include <libavutil/mathematics.h>
 }
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdint.h>
 
 /* suppress the ffmpeg compatibility macro */

src/lib/icu/CaseFold.cxx

@@ -40,9 +40,9 @@
 #include <windows.h>
 #endif
 
+#include <cassert>
 #include <memory>
 
-#include <assert.h>
 #include <string.h>
 
 AllocatedString<>

src/lib/icu/Collate.cxx

@@ -38,10 +38,10 @@
 #include <windows.h>
 #endif
 
+#include <cassert>
 #include <memory>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 #ifdef HAVE_ICU

src/lib/icu/Util.cxx

@@ -24,10 +24,10 @@
 
 #include <unicode/ustring.h>
 
+#include <cassert>
 #include <memory>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 AllocatedArray<UChar>

src/lib/nfs/Base.cxx

@@ -19,7 +19,8 @@
 
 #include "Base.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static char nfs_base_server[64];

src/lib/nfs/Cancellable.hxx

@@ -25,8 +25,7 @@
 #include <boost/intrusive/list.hpp>
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 template<typename T>
 class CancellablePointer

src/lib/nfs/Error.cxx

@@ -37,7 +37,8 @@ extern "C" {
 #include <nfsc/libnfs.h>
 }
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static StringBuffer<256>

src/lib/nfs/FileReader.cxx

@@ -24,10 +24,10 @@
 #include "event/Call.hxx"
 #include "util/ASCII.hxx"
 
-#include <utility>
+#include <cassert>
 #include <stdexcept>
+#include <utility>
 
-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 

src/lib/nfs/Glue.cxx

@@ -22,7 +22,7 @@
 #include "event/Call.hxx"
 #include "util/Manual.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static Manual<NfsManager> nfs_glue;
 static unsigned in_use;

src/lib/sqlite/Util.hxx

@@ -25,7 +25,7 @@
 
 #include <sqlite3.h>
 
-#include <assert.h>
+#include <cassert>
 
 namespace Sqlite {
 

src/lib/upnp/ClientInit.cxx

@@ -25,7 +25,7 @@
 
 #include <upnptools.h>
 
-#include <assert.h>
+#include <cassert>
 
 static Mutex upnp_client_init_mutex;
 static unsigned upnp_client_ref;

src/lib/upnp/Init.cxx

@@ -25,7 +25,7 @@
 #include <upnptools.h>
 #include <ixml.h>
 
-#include <assert.h>
+#include <cassert>
 
 static Mutex upnp_init_mutex;
 static unsigned upnp_ref;

src/lib/xiph/FlacStreamMetadata.cxx

@@ -30,7 +30,7 @@
 #include "ReplayGainInfo.hxx"
 #include "util/StringView.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static StringView
 ToStringView(const FLAC__StreamMetadata_VorbisComment_Entry &entry) noexcept

src/lib/xiph/OggPage.hxx

@@ -22,7 +22,8 @@
 
 #include <ogg/ogg.h>
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdint.h>
 

src/lib/xiph/OggStreamState.hxx

@@ -22,7 +22,8 @@
 
 #include <ogg/ogg.h>
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdint.h>
 

src/ls.cxx

@@ -24,7 +24,7 @@
 #include "client/Response.hxx"
 #include "util/UriExtract.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 #include <string>
 

src/mixer/MixerAll.cxx

@@ -24,7 +24,7 @@
 #include "pcm/Volume.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 gcc_pure
 static int

src/mixer/MixerControl.cxx

@@ -20,7 +20,7 @@
 #include "MixerControl.hxx"
 #include "MixerInternal.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 Mixer *
 mixer_new(EventLoop &event_loop,

src/mixer/MixerType.cxx

@@ -19,9 +19,9 @@
 
 #include "MixerType.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 MixerType

src/mixer/Volume.cxx

@@ -26,7 +26,8 @@
 #include "fs/io/BufferedOutputStream.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 
 #define SW_VOLUME_STATE                         "sw_volume: "

src/mixer/plugins/OssMixerPlugin.cxx

@@ -26,7 +26,8 @@
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>

src/mixer/plugins/PulseMixerPlugin.cxx

@@ -32,10 +32,9 @@
 #include <pulse/stream.h>
 #include <pulse/subscribe.h>
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
-
 class PulseMixer final : public Mixer {
 	PulseOutput &output;
 

src/mixer/plugins/SoftwareMixerPlugin.cxx

@@ -22,7 +22,8 @@
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "pcm/Volume.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <math.h>
 
 class SoftwareMixer final : public Mixer {

src/mixer/plugins/WinmmMixerPlugin.cxx

@@ -23,9 +23,9 @@
 
 #include <mmsystem.h>
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <math.h>
 #include <windows.h>
 

src/net/AddressInfo.cxx

@@ -30,7 +30,7 @@
 #include "AddressInfo.hxx"
 #include "Features.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr int address_family_ranking[] = {
 #ifdef HAVE_UN

src/net/IPv4Address.cxx

@@ -29,7 +29,7 @@
 
 #include "IPv4Address.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 static const struct sockaddr_in *
 CastToIPv4(const struct sockaddr *p) noexcept

src/net/IPv6Address.cxx

@@ -30,7 +30,8 @@
 #include "IPv6Address.hxx"
 #include "IPv4Address.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static const struct sockaddr_in6 *

src/net/SocketAddress.cxx

@@ -32,7 +32,8 @@
 #include "IPv6Address.hxx"
 #include "util/StringView.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 #ifdef HAVE_UN

src/net/StaticSocketAddress.hxx

@@ -34,7 +34,7 @@
 #include "Features.hxx"
 #include "util/Compiler.h"
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * An OO wrapper for struct sockaddr_storage.

src/net/ToString.cxx

@@ -34,6 +34,7 @@
 #include "IPv4Address.hxx"
 
 #include <algorithm>
+#include <cassert>
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
@@ -48,7 +49,6 @@
 #include <sys/un.h>
 #endif
 
-#include <assert.h>
 #include <string.h>
 
 #ifdef HAVE_UN

src/output/Control.cxx

@@ -24,7 +24,7 @@
 #include "config/Block.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 /** after a failure, wait this duration before
     automatically reopening the device */

src/output/Init.cxx

@@ -39,9 +39,9 @@
 #include "util/StringFormat.hxx"
 #include "Log.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 #define AUDIO_OUTPUT_TYPE	"type"

src/output/MultipleOutputs.cxx

@@ -30,9 +30,9 @@
 #include "util/RuntimeError.hxx"
 #include "util/StringAPI.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 
 MultipleOutputs::MultipleOutputs(AudioOutputClient &_client,

src/output/MultipleOutputs.hxx

@@ -28,11 +28,10 @@
 #include "Chrono.hxx"
 #include "util/Compiler.h"
 
+#include <cassert>
 #include <memory>
 #include <vector>
 
-#include <assert.h>
-
 class MusicPipe;
 class EventLoop;
 class MixerListener;

src/output/OutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "OutputPlugin.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 AudioOutput *
 ao_plugin_init(EventLoop &event_loop,

src/output/SharedPipeConsumer.hxx

@@ -22,7 +22,7 @@
 
 #include "util/Compiler.h"
 
-#include <assert.h>
+#include <cassert>
 
 struct MusicChunk;
 class MusicPipe;

src/output/Source.hxx

@@ -28,10 +28,10 @@
 #include "thread/Mutex.hxx"
 #include "util/ConstBuffer.hxx"
 
-#include <utility>
+#include <cassert>
 #include <memory>
+#include <utility>
 
-#include <assert.h>
 #include <stdint.h>
 
 struct MusicChunk;

src/output/Thread.cxx

@@ -29,7 +29,8 @@
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 void

src/output/Timer.cxx

@@ -20,7 +20,7 @@
 #include "Timer.hxx"
 #include "pcm/AudioFormat.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 Timer::Timer(const AudioFormat af)
 	:rate(af.sample_rate * af.GetFrameSize())

src/output/plugins/JackOutputPlugin.cxx

@@ -29,8 +29,7 @@
 #include "Log.hxx"
 
 #include <atomic>
-
-#include <assert.h>
+#include <cassert>
 
 #include <jack/jack.h>
 #include <jack/types.h>

src/output/plugins/OssOutputPlugin.cxx

@@ -27,6 +27,7 @@
 #include "util/ByteOrder.hxx"
 #include "Log.hxx"
 
+#include <cassert>
 #include <iterator>
 #include <stdexcept>
 
@@ -36,7 +37,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <assert.h>
 
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 # include <soundcard.h>

src/output/plugins/PulseOutputPlugin.cxx

@@ -33,9 +33,9 @@
 #include <pulse/subscribe.h>
 #include <pulse/version.h>
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
 

src/output/plugins/RecorderOutputPlugin.cxx

@@ -30,10 +30,10 @@
 #include "util/Domain.hxx"
 #include "util/ScopeExit.hxx"
 
-#include <stdexcept>
+#include <cassert>
 #include <memory>
+#include <stdexcept>
 
-#include <assert.h>
 #include <stdlib.h>
 
 static constexpr Domain recorder_domain("recorder");

src/output/plugins/ShoutOutputPlugin.cxx

@@ -30,10 +30,10 @@
 
 #include <shout/shout.h>
 
-#include <stdexcept>
+#include <cassert>
 #include <memory>
+#include <stdexcept>
 
-#include <assert.h>
 #include <stdio.h>
 
 static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2;

src/output/plugins/httpd/HttpdClient.cxx

@@ -27,7 +27,8 @@
 #include "net/UniqueSocketDescriptor.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdio.h>
 

src/output/plugins/httpd/HttpdOutputPlugin.cxx

@@ -32,7 +32,7 @@
 #include "util/DeleteDisposer.hxx"
 #include "config/Net.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 #include <string.h>
 

src/pcm/AudioFormat.cxx

@@ -20,7 +20,8 @@
 #include "AudioFormat.hxx"
 #include "util/StringBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdio.h>
 
 void

src/pcm/AudioParser.cxx

@@ -26,7 +26,8 @@
 #include "AudioFormat.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdlib.h>
 

src/pcm/ChannelsConverter.cxx

@@ -22,7 +22,7 @@
 #include "util/ConstBuffer.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 PcmChannelsConverter::Open(SampleFormat _format,

src/pcm/ChannelsConverter.hxx

@@ -24,7 +24,7 @@
 #include "Buffer.hxx"
 
 #ifndef NDEBUG
-#include <assert.h>
+#include <cassert>
 #endif
 
 template<typename T> struct ConstBuffer;

src/pcm/ConfiguredResampler.cxx

@@ -34,7 +34,8 @@
 #include "SoxrResampler.hxx"
 #endif
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 enum class SelectedResampler {

src/pcm/Convert.cxx

@@ -21,10 +21,9 @@
 #include "ConfiguredResampler.hxx"
 #include "util/ConstBuffer.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
-
 void
 pcm_convert_global_init(const ConfigData &config)
 {

src/pcm/Dop.cxx

@@ -21,10 +21,9 @@
 #include "ChannelDefs.hxx"
 #include "util/ConstBuffer.hxx"
 
+#include <cassert>
 #include <functional>
 
-#include <assert.h>
-
 static constexpr uint32_t
 pcm_two_dsd_to_dop_marker1(uint8_t a, uint8_t b) noexcept
 {

src/pcm/Dsd2Pcm.cxx

@@ -35,7 +35,8 @@ or implied, of Sebastian Gesemann.
 #include "util/BitReverse.hxx"
 #include "util/GenerateArray.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 #include <string.h>
 

src/pcm/Export.cxx

@@ -25,7 +25,8 @@
 #include "util/ConstBuffer.hxx"
 #include "util/WritableBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 void

src/pcm/FallbackResampler.cxx

@@ -19,7 +19,7 @@
 
 #include "FallbackResampler.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 AudioFormat
 FallbackPcmResampler::Open(AudioFormat &af, unsigned new_sample_rate)

src/pcm/FormatConverter.cxx

@@ -22,7 +22,7 @@
 #include "util/ConstBuffer.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 PcmFormatConverter::Open(SampleFormat _src_format, SampleFormat _dest_format)

src/pcm/FormatConverter.hxx

@@ -25,7 +25,7 @@
 #include "Dither.hxx"
 
 #ifndef NDEBUG
-#include <assert.h>
+#include <cassert>
 #endif
 
 template<typename T> struct ConstBuffer;

src/pcm/GlueResampler.cxx

@@ -22,7 +22,7 @@
 #include "Resampler.hxx"
 #include "AudioFormat.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 GluePcmResampler::GluePcmResampler()
 	:resampler(pcm_resampler_create()) {}

src/pcm/LibsamplerateResampler.cxx

@@ -24,7 +24,8 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 #include <string.h>
 

src/pcm/Mix.cxx

@@ -25,10 +25,9 @@
 
 #include "Dither.cxx" // including the .cxx file to get inlined templates
 
+#include <cassert>
 #include <cmath>
 
-#include <assert.h>
-
 template<SampleFormat F, class Traits=SampleTraits<F>>
 static typename Traits::value_type
 PcmAddVolume(PcmDither &dither,

src/pcm/PcmChannels.cxx

@@ -27,8 +27,7 @@
 
 #include <array>
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 template<typename D, typename S>
 static void

src/pcm/PcmDsd.cxx

@@ -21,7 +21,7 @@
 #include "Dsd2Pcm.hxx"
 #include "util/ConstBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 ConstBuffer<float>
 PcmDsd::ToFloat(unsigned channels, ConstBuffer<uint8_t> src) noexcept

src/pcm/RestBuffer.hxx

@@ -23,8 +23,8 @@
 #include "ChannelDefs.hxx"
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <stddef.h>
 
 template<typename T> struct ConstBuffer;

src/pcm/SampleFormat.cxx

@@ -19,7 +19,7 @@
 
 #include "SampleFormat.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 const char *
 sample_format_to_string(SampleFormat format) noexcept

src/pcm/SoxrResampler.cxx

@@ -26,7 +26,8 @@
 
 #include <soxr.h>
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static constexpr Domain soxr_domain("soxr");

src/pcm/Volume.cxx

@@ -27,7 +27,8 @@
 
 #include "Dither.cxx" // including the .cxx file to get inlined templates
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdint.h>
 #include <string.h>
 

src/pcm/Volume.hxx

@@ -25,7 +25,7 @@
 #include "Dither.hxx"
 
 #ifndef NDEBUG
-#include <assert.h>
+#include <cassert>
 #endif
 
 template<typename T> struct ConstBuffer;

src/player/Control.cxx

@@ -23,8 +23,7 @@
 #include "song/DetachedSong.hxx"
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 PlayerControl::PlayerControl(PlayerListener &_listener,
 			     PlayerOutputs &_outputs,

src/player/CrossFade.cxx

@@ -25,10 +25,9 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
+#include <cassert>
 #include <cmath>
 
-#include <assert.h>
-
 static constexpr Domain cross_fade_domain("cross_fade");
 
 gcc_pure

src/playlist/PlaylistMapper.cxx

@@ -26,7 +26,7 @@
 #include "storage/StorageInterface.hxx"
 #include "util/UriUtil.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * Load a playlist from the configured playlist directory.

src/playlist/PlaylistRegistry.cxx

@@ -38,10 +38,9 @@
 #include "config/Data.hxx"
 #include "config/Block.hxx"
 
+#include <cassert>
 #include <iterator>
 
-#include <assert.h>
-
 const PlaylistPlugin *const playlist_plugins[] = {
 	&extm3u_playlist_plugin,
 	&m3u_playlist_plugin,

src/playlist/PlaylistStream.cxx

@@ -26,10 +26,9 @@
 #include "util/UriExtract.hxx"
 #include "Log.hxx"
 
+#include <cassert>
 #include <exception>
 
-#include <assert.h>
-
 static std::unique_ptr<SongEnumerator>
 playlist_open_path_suffix(Path path, Mutex &mutex)
 try {

src/playlist/cue/CueParser.cxx

@@ -23,7 +23,8 @@
 #include "util/StringStrip.hxx"
 #include "util/CharUtil.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <stdlib.h>
 

src/queue/IdTable.hxx

@@ -23,8 +23,7 @@
 #include "util/Compiler.h"
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 /**
  * A table that maps id numbers to position numbers.

src/queue/Playlist.cxx

@@ -25,7 +25,7 @@
 #include "SingleMode.hxx"
 #include "Log.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 playlist::TagModified(DetachedSong &&song) noexcept

src/queue/Queue.hxx

@@ -25,9 +25,9 @@
 #include "SingleMode.hxx"
 #include "util/LazyRandomEngine.hxx"
 
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
 #include <stdint.h>
 
 class DetachedSong;

src/song/Filter.cxx

@@ -37,7 +37,8 @@
 #include "util/ASCII.hxx"
 #include "util/UriUtil.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 
 #define LOCATE_TAG_FILE_KEY     "file"

src/song/StringFilter.cxx

@@ -20,7 +20,7 @@
 #include "StringFilter.hxx"
 #include "util/StringAPI.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 bool
 StringFilter::MatchWithoutNegation(const char *s) const noexcept

src/sticker/Database.cxx

@@ -25,10 +25,9 @@
 #include "util/StringCompare.hxx"
 #include "util/ScopeExit.hxx"
 
+#include <cassert>
 #include <iterator>
 
-#include <assert.h>
-
 using namespace Sqlite;
 
 enum sticker_sql {

src/storage/MemoryDirectoryReader.cxx

@@ -19,7 +19,7 @@
 
 #include "MemoryDirectoryReader.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 const char *
 MemoryStorageDirectoryReader::Read() noexcept

src/storage/plugins/CurlStorage.cxx

@@ -41,12 +41,11 @@
 #include "util/StringFormat.hxx"
 #include "util/UriExtract.hxx"
 
+#include <cassert>
 #include <memory>
 #include <string>
 #include <utility>
 
-#include <assert.h>
-
 class CurlStorage final : public Storage {
 	const std::string base;
 

src/storage/plugins/NfsStorage.cxx

@@ -42,9 +42,9 @@ extern "C" {
 #include <nfsc/libnfs-raw-nfs.h>
 }
 
+#include <cassert>
 #include <string>
 
-#include <assert.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 

src/system/EventFD.cxx

@@ -31,7 +31,8 @@
 #include "system/Error.hxx"
 #include "util/Compiler.h"
 
-#include <assert.h>
+#include <cassert>
+
 #include <sys/eventfd.h>
 
 EventFD::EventFD()

src/system/EventPipe.cxx

@@ -22,7 +22,8 @@
 #include "system/Error.hxx"
 #include "util/Compiler.h"
 
-#include <assert.h>
+#include <cassert>
+
 #include <unistd.h>
 
 #ifdef _WIN32

src/system/FileDescriptor.cxx

@@ -30,7 +30,8 @@
 #include "FileDescriptor.hxx"
 #include "system/Error.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdint.h>
 #include <sys/stat.h>
 #include <fcntl.h>

src/system/SignalFD.cxx

@@ -30,7 +30,8 @@
 #include "SignalFD.hxx"
 #include "Error.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <sys/signalfd.h>
 
 void

src/system/UniqueFileDescriptor.hxx

@@ -32,10 +32,9 @@
 
 #include "FileDescriptor.hxx"
 
+#include <cassert>
 #include <utility>
 
-#include <assert.h>
-
 /**
  * An OO wrapper for a UNIX file descriptor.
  */

src/tag/ApeLoader.cxx

@@ -22,10 +22,10 @@
 #include "input/InputStream.hxx"
 #include "util/StringView.hxx"
 
+#include <cassert>
 #include <memory>
 
 #include <stdint.h>
-#include <assert.h>
 #include <string.h>
 
 struct ApeFooter {

src/tag/Builder.cxx

@@ -27,8 +27,8 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 
-#include <assert.h>
 #include <stdlib.h>
 
 TagBuilder::TagBuilder(const Tag &other) noexcept

src/tag/FixString.cxx

@@ -23,7 +23,8 @@
 #include "util/StringView.hxx"
 #include "util/UTF8.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 
 gcc_pure

src/tag/MixRamp.cxx

@@ -23,7 +23,7 @@
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 template<typename T>
 static bool

src/tag/ParseName.cxx

@@ -21,7 +21,8 @@
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 TagType

src/tag/Pool.cxx

@@ -23,9 +23,9 @@
 #include "util/VarSize.hxx"
 #include "util/StringView.hxx"
 
+#include <cassert>
 #include <limits>
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>

src/tag/ReplayGain.cxx

@@ -23,7 +23,7 @@
 #include "util/ASCII.hxx"
 #include "util/NumberParser.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 template<typename T>
 static bool

src/tag/Tag.cxx

@@ -21,7 +21,7 @@
 #include "Pool.hxx"
 #include "Builder.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 void
 Tag::Clear() noexcept

src/tag/VorbisComment.cxx

@@ -20,7 +20,7 @@
 #include "VorbisComment.hxx"
 #include "util/StringView.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 StringView
 GetVorbisCommentValue(StringView entry, StringView name) noexcept

src/thread/Thread.hxx

@@ -23,14 +23,14 @@
 #include "util/BindMethod.hxx"
 #include "util/Compiler.h"
 
+#include <cassert>
+
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <pthread.h>
 #endif
 
-#include <assert.h>
-
 class Thread {
 	typedef BoundMethod<void() noexcept> Function;
 	const Function f;

src/time/ISO8601.cxx

@@ -34,9 +34,9 @@
 #include "Convert.hxx"
 #include "util/StringBuffer.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <stdlib.h>
 
 StringBuffer<64>

src/time/Parser.cxx

@@ -30,9 +30,9 @@
 #include "Parser.hxx"
 #include "Convert.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <time.h>
 
 std::chrono::system_clock::time_point

src/unix/PidFile.hxx

@@ -24,7 +24,8 @@
 #include "fs/AllocatedPath.hxx"
 #include "system/Error.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>

src/util/ASCII.hxx

@@ -33,7 +33,8 @@
 #include "StringView.hxx"
 #include "Compiler.h"
 
-#include <assert.h>
+#include <cassert>
+
 #include <strings.h>
 
 /**

src/util/AllocatedArray.hxx

@@ -35,8 +35,7 @@
 #include "Compiler.h"
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 /**
  * An array allocated on the heap with a length determined at runtime.

src/util/ByteReverse.cxx

@@ -21,7 +21,7 @@
 #include "util/ByteOrder.hxx"
 #include "Compiler.h"
 
-#include <assert.h>
+#include <cassert>
 
 void
 reverse_bytes_16(uint16_t *gcc_restrict dest,

src/util/CircularBuffer.hxx

@@ -32,7 +32,8 @@
 
 #include "WritableBuffer.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stddef.h>
 
 /**

src/util/ConstBuffer.hxx

@@ -35,7 +35,7 @@
 #include <cstddef>
 
 #ifndef NDEBUG
-#include <assert.h>
+#include <cassert>
 #endif
 
 template<typename T>

src/util/DivideString.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_DIVIDE_STRING_HXX
 #define MPD_DIVIDE_STRING_HXX
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * Split a given constant string at a separator character.  Duplicates

src/util/ForeignFifoBuffer.hxx

@@ -32,12 +32,10 @@
 
 #include "WritableBuffer.hxx"
 
-#include <utility>
 #include <algorithm>
-
+#include <cassert>
 #include <cstddef>
-
-#include <assert.h>
+#include <utility>
 
 /**
  * A first-in-first-out buffer: you can append data at the end, and

src/util/LazyRandomEngine.hxx

@@ -20,10 +20,9 @@
 #ifndef MPD_LAZY_RANDOM_ENGINE_HXX
 #define MPD_LAZY_RANDOM_ENGINE_HXX
 
+#include <cassert>
 #include <random>
 
-#include <assert.h>
-
 /**
  * A random engine that will be created and seeded on demand.
  */

src/util/Manual.hxx

@@ -30,11 +30,10 @@
 #ifndef MANUAL_HXX
 #define MANUAL_HXX
 
+#include <cassert>
 #include <new>
 #include <utility>
 
-#include <assert.h>
-
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"

src/util/NumberParser.hxx

@@ -31,7 +31,8 @@
 #ifndef NUMBER_PARSER_HXX
 #define NUMBER_PARSER_HXX
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdint.h>
 #include <stdlib.h>
 

src/util/OptionDef.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_UTIL_OPTIONDEF_HXX
 #define MPD_UTIL_OPTIONDEF_HXX
 
-#include <assert.h>
+#include <cassert>
 
 /**
  * Command line option definition.

src/util/PeakBuffer.cxx

@@ -21,8 +21,8 @@
 #include "DynamicFifoBuffer.hxx"
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
 #include <string.h>
 
 PeakBuffer::~PeakBuffer()

src/util/SliceBuffer.hxx

@@ -23,10 +23,10 @@
 #include "HugeAllocator.hxx"
 #include "Compiler.h"
 
-#include <utility>
+#include <cassert>
 #include <new>
+#include <utility>
 
-#include <assert.h>
 #include <stddef.h>
 
 /**

src/util/SparseBuffer.hxx

@@ -34,10 +34,9 @@
 #include "ConstBuffer.hxx"
 #include "WritableBuffer.hxx"
 
+#include <cassert>
 #include <map>
 
-#include <assert.h>
-
 /**
  * Helper class for #SparseBuffer which describes which portions of
  * the buffer have "known" data.

src/util/StaticFifoBuffer.hxx

@@ -32,11 +32,10 @@
 
 #include "WritableBuffer.hxx"
 
-#include <utility>
 #include <algorithm>
+#include <cassert>
 #include <cstddef>
-
-#include <assert.h>
+#include <utility>
 
 /**
  * A first-in-first-out buffer: you can append data at the end, and

src/util/StringUtil.cxx

@@ -22,7 +22,7 @@
 #include "CharUtil.hxx"
 #include "ASCII.hxx"
 
-#include <assert.h>
+#include <cassert>
 
 bool
 StringArrayContainsCase(const char *const*haystack,

src/util/UriRelative.cxx

@@ -32,7 +32,8 @@
 #include "StringAPI.hxx"
 #include "StringCompare.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 bool

src/util/UriUtil.cxx

@@ -30,7 +30,8 @@
 #include "UriUtil.hxx"
 #include "ASCII.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <string.h>
 
 static const char *

src/util/WritableBuffer.hxx

@@ -36,7 +36,7 @@
 #include <cstddef>
 
 #ifndef NDEBUG
-#include <assert.h>
+#include <cassert>
 #endif
 
 template<typename T>

test/ContainerScan.cxx

@@ -28,9 +28,9 @@
 #include "util/PrintException.hxx"
 #include "util/UriExtract.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

test/RunChromaprint.cxx

@@ -34,9 +34,9 @@
 #include "Log.hxx"
 #include "LogBackend.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

test/read_mixer.cxx

@@ -25,7 +25,8 @@
 #include "config/Block.hxx"
 #include "util/PrintException.hxx"
 
-#include <assert.h>
+#include <cassert>
+
 #include <stdlib.h>
 
 const FilterPlugin *

test/read_tags.cxx

@@ -33,9 +33,9 @@
 #include "util/StringView.hxx"
 #include "util/PrintException.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

test/run_convert.cxx

@@ -36,9 +36,9 @@
 #include "Log.hxx"
 #include "LogBackend.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>

test/run_decoder.cxx

@@ -33,9 +33,9 @@
 #include "Log.hxx"
 #include "LogBackend.hxx"
 
+#include <cassert>
 #include <stdexcept>
 
-#include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

test/run_filter.cxx

@@ -33,10 +33,10 @@
 #include "util/RuntimeError.hxx"
 #include "util/PrintException.hxx"
 
+#include <cassert>
 #include <memory>
 #include <stdexcept>
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

test/run_output.cxx

@@ -30,9 +30,9 @@
 #include "util/ScopeExit.hxx"
 #include "util/PrintException.hxx"
 
+#include <cassert>
 #include <memory>
 
-#include <assert.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>

test/test_vorbis_encoder.cxx

@@ -28,9 +28,9 @@
 #include "tag/Builder.hxx"
 #include "util/PrintException.hxx"
 
+#include <cassert>
 #include <memory>
 
-#include <assert.h>
 #include <stddef.h>
 
 static uint8_t zero[256];