Skip to content

M
mpd
Unverified Commit ab9f5d20 authored by Rosen Penev's avatar Rosen Penev
Browse files
Options

replace assert.h with cassert

The former was deprecated with C++14. According to the C++11 and C++17 standards, both files are identical. Signed-off-by: 's avatarRosen Penev <rosenp@gmail.com>
parent a718086f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 137 deletions
src/IcyMetaDataParser.cxx
View file @ ab9f5d20
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <string.h> #include <string.h>
#ifdef HAVE_ICU_CONVERTER #ifdef HAVE_ICU_CONVERTER
......
src/Idle.cxx
View file @ ab9f5d20
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "Main.hxx" #include "Main.hxx"
#include "Instance.hxx" #include "Instance.hxx"
#include <assert.h> #include <cassert>
void void
idle_add(unsigned flags) idle_add(unsigned flags)
......
src/IdleFlags.cxx
View file @ ab9f5d20
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "IdleFlags.hxx" #include "IdleFlags.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include <assert.h> #include <cassert>
static const char *const idle_names[] = { static const char *const idle_names[] = {
"database", "database",
......
src/LogBackend.cxx
View file @ ab9f5d20
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "util/StringStrip.hxx" #include "util/StringStrip.hxx"
#include "config.h" #include "config.h"
#include <assert.h> #include <cassert>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
......
src/LogInit.cxx
View file @ ab9f5d20
...@@ -30,11 +30,12 @@ ...@@ -30,11 +30,12 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include <cassert>
#ifdef ENABLE_SYSTEMD_DAEMON #ifdef ENABLE_SYSTEMD_DAEMON
#include <systemd/sd-daemon.h> #include <systemd/sd-daemon.h>
#endif #endif
#include <assert.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
......
src/Mapper.cxx
View file @ ab9f5d20
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Main.hxx" #include "Main.hxx"
#endif #endif
#include <assert.h> #include <cassert>
/** /**
* The absolute path of the playlist directory encoded in the * The absolute path of the playlist directory encoded in the
......
src/MusicBuffer.cxx
View file @ ab9f5d20
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "MusicBuffer.hxx" #include "MusicBuffer.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include <assert.h> #include <cassert>
MusicBuffer::MusicBuffer(unsigned num_chunks) MusicBuffer::MusicBuffer(unsigned num_chunks)
:buffer(num_chunks) { :buffer(num_chunks) {
......
src/MusicChunk.cxx
View file @ ab9f5d20
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include <assert.h> #include <cassert>
MusicChunkInfo::MusicChunkInfo() noexcept = default; MusicChunkInfo::MusicChunkInfo() noexcept = default;
MusicChunkInfo::~MusicChunkInfo() noexcept = default; MusicChunkInfo::~MusicChunkInfo() noexcept = default;
......
src/MusicPipe.cxx
View file @ ab9f5d20
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "MusicPipe.hxx" #include "MusicPipe.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include <assert.h> #include <cassert>
#ifndef NDEBUG #ifndef NDEBUG
......
src/Permission.cxx
View file @ ab9f5d20
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <cassert>
#include <map> #include <map>
#include <string> #include <string>
#include <utility> #include <utility>
#include <assert.h>
#include <string.h> #include <string.h>
static constexpr char PERMISSION_PASSWORD_CHAR = '@'; static constexpr char PERMISSION_PASSWORD_CHAR = '@';
......
src/PlaylistFile.cxx
View file @ ab9f5d20
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static const char PLAYLIST_COMMENT = '#'; static const char PLAYLIST_COMMENT = '#';
......
src/ReplayGainGlobal.cxx
View file @ ab9f5d20
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"
#include "config/Data.hxx" #include "config/Data.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
......
src/ReplayGainMode.cxx
View file @ ab9f5d20
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "ReplayGainMode.hxx" #include "ReplayGainMode.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
const char * const char *
......
src/SingleMode.cxx
View file @ ab9f5d20
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "SingleMode.hxx" #include "SingleMode.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
const char * const char *
......
src/SongLoader.cxx
View file @ ab9f5d20
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "PlaylistError.hxx" #include "PlaylistError.hxx"
#include "config.h" #include "config.h"
#include <assert.h> #include <cassert>
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
......
src/SongUpdate.cxx
View file @ ab9f5d20
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
#include "TagArchive.hxx" #include "TagArchive.hxx"
#endif #endif
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
......
src/TagFile.cxx
View file @ ab9f5d20
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "input/LocalOpen.hxx" #include "input/LocalOpen.hxx"
#include <assert.h> #include <cassert>
class TagFileScan { class TagFileScan {
const Path path_fs; const Path path_fs;
......
src/TagStream.cxx
View file @ ab9f5d20
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include <assert.h> #include <cassert>
/** /**
* Does the #DecoderPlugin support either the suffix or the MIME type? * Does the #DecoderPlugin support either the suffix or the MIME type?
......
src/archive/ArchiveList.cxx
View file @ ab9f5d20
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include "plugins/Iso9660ArchivePlugin.hxx" #include "plugins/Iso9660ArchivePlugin.hxx"
#include "plugins/ZzipArchivePlugin.hxx" #include "plugins/ZzipArchivePlugin.hxx"
#include <cassert>
#include <iterator> #include <iterator>
#include <assert.h>
#include <string.h> #include <string.h>
const ArchivePlugin *const archive_plugins[] = { const ArchivePlugin *const archive_plugins[] = {
......
src/archive/ArchivePlugin.cxx
View file @ ab9f5d20
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "ArchiveFile.hxx" #include "ArchiveFile.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include <assert.h> #include <cassert>
std::unique_ptr<ArchiveFile> std::unique_ptr<ArchiveFile>
archive_file_open(const ArchivePlugin *plugin, Path path) archive_file_open(const ArchivePlugin *plugin, Path path)
......
src/client/Idle.cxx
View file @ ab9f5d20
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "Response.hxx" #include "Response.hxx"
#include "Idle.hxx" #include "Idle.hxx"
#include <assert.h> #include <cassert>
static void static void
WriteIdleResponse(Response &r, unsigned flags) noexcept WriteIdleResponse(Response &r, unsigned flags) noexcept
......
src/client/List.cxx
View file @ ab9f5d20
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "List.hxx" #include "List.hxx"
#include "util/DeleteDisposer.hxx" #include "util/DeleteDisposer.hxx"
#include <assert.h> #include <cassert>
ClientList::~ClientList() noexcept ClientList::~ClientList() noexcept
{ {
......
src/client/New.cxx
View file @ ab9f5d20
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "net/ToString.hxx" #include "net/ToString.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n"; static constexpr char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
......
src/client/Subscribe.cxx
View file @ ab9f5d20
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "Partition.hxx" #include "Partition.hxx"
#include "IdleFlags.hxx" #include "IdleFlags.hxx"
#include <assert.h> #include <cassert>
Client::SubscribeResult Client::SubscribeResult
Client::Subscribe(const char *channel) noexcept Client::Subscribe(const char *channel) noexcept
......
src/command/AllCommands.cxx
View file @ ab9f5d20
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
#include "StickerCommands.hxx" #include "StickerCommands.hxx"
#endif #endif
#include <cassert>
#include <iterator> #include <iterator>
#include <assert.h>
#include <string.h> #include <string.h>
/* /*
......
src/command/CommandListBuilder.hxx
View file @ ab9f5d20
...@@ -20,11 +20,10 @@ ...@@ -20,11 +20,10 @@
#ifndef MPD_COMMAND_LIST_BUILDER_HXX #ifndef MPD_COMMAND_LIST_BUILDER_HXX
#define MPD_COMMAND_LIST_BUILDER_HXX #define MPD_COMMAND_LIST_BUILDER_HXX
#include <cassert>
#include <list> #include <list>
#include <string> #include <string>
#include <assert.h>
class CommandListBuilder { class CommandListBuilder {
/** /**
* print OK after each command execution * print OK after each command execution
......
src/command/FileCommands.cxx
View file @ ab9f5d20
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
#include <inttypes.h> /* for PRIu64 */ #include <inttypes.h> /* for PRIu64 */
gcc_pure gcc_pure
......
src/command/MessageCommands.cxx
View file @ ab9f5d20
...@@ -25,11 +25,10 @@ ...@@ -25,11 +25,10 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "Partition.hxx" #include "Partition.hxx"
#include <cassert>
#include <set> #include <set>
#include <string> #include <string>
#include <assert.h>
CommandResult CommandResult
handle_subscribe(Client &client, Request args, Response &r) handle_subscribe(Client &client, Request args, Response &r)
{ {
......
src/command/OtherCommands.cxx
View file @ ab9f5d20
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include "db/update/Service.hxx" #include "db/update/Service.hxx"
#endif #endif
#include <assert.h> #include <cassert>
static void static void
print_spl_list(Response &r, const PlaylistVector &list) print_spl_list(Response &r, const PlaylistVector &list)
......
src/command/Request.hxx
View file @ ab9f5d20
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "Chrono.hxx" #include "Chrono.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
class Response; class Response;
class Request : public ConstBuffer<const char *> { class Request : public ConstBuffer<const char *> {
......
src/config/File.cxx
View file @ ab9f5d20
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "fs/io/BufferedReader.hxx" #include "fs/io/BufferedReader.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
static constexpr char CONF_COMMENT = '#'; static constexpr char CONF_COMMENT = '#';
......
src/config/Path.cxx
View file @ ab9f5d20
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include "fs/StandardDirectory.hxx" #include "fs/StandardDirectory.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#ifndef _WIN32 #ifndef _WIN32
......
src/db/DatabaseLock.hxx
View file @ ab9f5d20
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
extern Mutex db_mutex; extern Mutex db_mutex;
......
src/db/DatabaseSong.cxx
View file @ ab9f5d20
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include "util/UriRelative.hxx" #include "util/UriRelative.hxx"
#include <assert.h> #include <cassert>
DetachedSong DetachedSong
DatabaseDetachSong(const Storage *storage, const LightSong &song) noexcept DatabaseDetachSong(const Storage *storage, const LightSong &song) noexcept
......
src/db/PlaylistVector.cxx
View file @ ab9f5d20
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
PlaylistVector::iterator PlaylistVector::iterator
PlaylistVector::find(const char *name) noexcept PlaylistVector::find(const char *name) noexcept
......
src/db/VHelper.cxx
View file @ ab9f5d20
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "song/Filter.hxx" #include "song/Filter.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
src/db/plugins/simple/Directory.cxx
View file @ ab9f5d20
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "util/DeleteDisposer.hxx" #include "util/DeleteDisposer.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
......
src/db/plugins/upnp/UpnpDatabasePlugin.cxx
View file @ ab9f5d20
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
#include "util/RecursiveMap.hxx" #include "util/RecursiveMap.hxx"
#include "util/SplitString.hxx" #include "util/SplitString.hxx"
#include <cassert>
#include <string> #include <string>
#include <utility> #include <utility>
#include <assert.h>
#include <string.h> #include <string.h>
static const char *const rootid = "0"; static const char *const rootid = "0";
......
src/db/update/Editor.cxx
View file @ ab9f5d20
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "db/plugins/simple/Directory.hxx" #include "db/plugins/simple/Directory.hxx"
#include "db/plugins/simple/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include <assert.h> #include <cassert>
void void
DatabaseEditor::DeleteSong(Directory &dir, Song *del) DatabaseEditor::DeleteSong(Directory &dir, Song *del)
......
src/db/update/ExcludeList.cxx
View file @ ab9f5d20
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "util/StringStrip.hxx" #include "util/StringStrip.hxx"
#include "config.h" #include "config.h"
#include <assert.h> #include <cassert>
#ifdef HAVE_CLASS_GLOB #ifdef HAVE_CLASS_GLOB
......
src/db/update/InotifyUpdate.cxx
View file @ ab9f5d20
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <string> #include <cassert>
#include <map>
#include <forward_list> #include <forward_list>
#include <map>
#include <string>
#include <assert.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include <string.h> #include <string.h>
#include <dirent.h> #include <dirent.h>
......
src/db/update/Service.cxx
View file @ ab9f5d20
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "event/Loop.hxx" #include "event/Loop.hxx"
#endif #endif
#include <assert.h> #include <cassert>
UpdateService::UpdateService(const ConfigData &_config, UpdateService::UpdateService(const ConfigData &_config,
EventLoop &_loop, SimpleDatabase &_db, EventLoop &_loop, SimpleDatabase &_db,
......
src/db/update/Walk.cxx
View file @ ab9f5d20
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
#include "util/UriExtract.hxx" #include "util/UriExtract.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <memory> #include <memory>
#include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
......
src/decoder/Bridge.cxx
View file @ ab9f5d20
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
......
src/decoder/Control.cxx
View file @ ab9f5d20
...@@ -21,10 +21,9 @@ ...@@ -21,10 +21,9 @@
#include "MusicPipe.hxx" #include "MusicPipe.hxx"
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond, DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond,
InputCacheManager *_input_cache, InputCacheManager *_input_cache,
const AudioFormat _configured_audio_format, const AudioFormat _configured_audio_format,
......
src/decoder/Control.hxx
View file @ ab9f5d20
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"
#include "ReplayGainMode.hxx" #include "ReplayGainMode.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <utility>
#include <memory> #include <memory>
#include <utility>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
/* damn you, windows.h! */ /* damn you, windows.h! */
......
src/decoder/DecoderAPI.cxx
View file @ ab9f5d20
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <cassert>
size_t size_t
decoder_read(DecoderClient *client, decoder_read(DecoderClient *client,
......
src/decoder/DecoderPlugin.cxx
View file @ ab9f5d20
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include <assert.h> #include <cassert>
bool bool
DecoderPlugin::SupportsSuffix(const char *suffix) const noexcept DecoderPlugin::SupportsSuffix(const char *suffix) const noexcept
......
src/decoder/DecoderPrint.cxx
View file @ ab9f5d20
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "client/Response.hxx" #include "client/Response.hxx"
#include <cassert>
#include <functional> #include <functional>
#include <assert.h>
static void static void
decoder_plugin_print(Response &r, decoder_plugin_print(Response &r,
const DecoderPlugin &plugin) const DecoderPlugin &plugin)
......
src/decoder/plugins/AdPlugDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <adplug/adplug.h> #include <adplug/adplug.h>
#include <adplug/emuopl.h> #include <adplug/emuopl.h>
#include <assert.h> #include <cassert>
static constexpr Domain adplug_domain("adplug"); static constexpr Domain adplug_domain("adplug");
......
src/decoder/plugins/AudiofileDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#include <audiofile.h> #include <audiofile.h>
#include <af_vfs.h> #include <af_vfs.h>
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
src/decoder/plugins/FaadDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include <neaacdec.h> #include <neaacdec.h>
#include <cassert>
#include <cmath> #include <cmath>
#include <assert.h>
#include <string.h> #include <string.h>
static const unsigned adts_sample_rates[] = static const unsigned adts_sample_rates[] =
......
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -52,7 +52,8 @@ extern "C" { ...@@ -52,7 +52,8 @@ extern "C" {
#include <libavutil/frame.h> #include <libavutil/frame.h>
} }
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
/** /**
......
src/decoder/plugins/FlacPcm.cxx
View file @ ab9f5d20
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <assert.h> #include <cassert>
void void
FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample, FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample,
......
src/decoder/plugins/FlacStreamDecoder.hxx
View file @ ab9f5d20
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include <FLAC/stream_decoder.h> #include <FLAC/stream_decoder.h>
#include <utility> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <utility>
#include <assert.h>
/** /**
* OO wrapper for a FLAC__StreamDecoder. * OO wrapper for a FLAC__StreamDecoder.
......
src/decoder/plugins/GmeDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
#include <gme/gme.h> #include <gme/gme.h>
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
src/decoder/plugins/MadDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
#include <id3tag.h> #include <id3tag.h>
#endif #endif
#include <assert.h> #include <cassert>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
......
src/decoder/plugins/MikmodDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <mikmod.h> #include <mikmod.h>
#include <assert.h> #include <cassert>
static constexpr Domain mikmod_domain("mikmod"); static constexpr Domain mikmod_domain("mikmod");
......
src/decoder/plugins/ModplugDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include <libmodplug/modplug.h> #include <libmodplug/modplug.h>
#include <cassert>
#include <assert.h>
static constexpr Domain modplug_domain("modplug"); static constexpr Domain modplug_domain("modplug");
......
src/decoder/plugins/WavpackDecoderPlugin.cxx
View file @ ab9f5d20
...@@ -31,13 +31,11 @@ ...@@ -31,13 +31,11 @@
#include <wavpack/wavpack.h> #include <wavpack/wavpack.h>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <cstdlib>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <cstdlib>
#include <assert.h>
#define ERRORLEN 80 #define ERRORLEN 80
#ifdef OPEN_DSD_AS_PCM #ifdef OPEN_DSD_AS_PCM
......
src/encoder/EncoderInterface.hxx
View file @ ab9f5d20
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "EncoderPlugin.hxx" #include "EncoderPlugin.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
#include <stddef.h> #include <stddef.h>
struct AudioFormat; struct AudioFormat;
......
src/encoder/plugins/LameEncoderPlugin.cxx
View file @ ab9f5d20
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include <lame/lame.h> #include <lame/lame.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
class LameEncoder final : public Encoder { class LameEncoder final : public Encoder {
......
src/encoder/plugins/OpusEncoderPlugin.cxx
View file @ ab9f5d20
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include <opus.h> #include <opus.h>
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
namespace { namespace {
......
src/encoder/plugins/TwolameEncoderPlugin.cxx
View file @ ab9f5d20
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include <twolame.h> #include <twolame.h>
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
class TwolameEncoder final : public Encoder { class TwolameEncoder final : public Encoder {
......
src/encoder/plugins/WaveEncoderPlugin.cxx
View file @ ab9f5d20
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "util/DynamicFifoBuffer.hxx" #include "util/DynamicFifoBuffer.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
static constexpr uint16_t WAVE_FORMAT_PCM = 1; static constexpr uint16_t WAVE_FORMAT_PCM = 1;
......
src/event/BufferedSocket.hxx
View file @ ab9f5d20
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "SocketMonitor.hxx" #include "SocketMonitor.hxx"
#include "util/StaticFifoBuffer.hxx" #include "util/StaticFifoBuffer.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
#include <stdint.h> #include <stdint.h>
class EventLoop; class EventLoop;
......
src/event/Call.cxx
View file @ ab9f5d20
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
class BlockingCallMonitor final class BlockingCallMonitor final
{ {
DeferEvent defer_event; DeferEvent defer_event;
......
src/event/FullyBufferedSocket.cxx
View file @ ab9f5d20
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#include "net/SocketError.hxx" #include "net/SocketError.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
FullyBufferedSocket::ssize_t FullyBufferedSocket::ssize_t
......
src/event/IdleMonitor.cxx
View file @ ab9f5d20
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "IdleMonitor.hxx" #include "IdleMonitor.hxx"
#include "Loop.hxx" #include "Loop.hxx"
#include <assert.h> #include <cassert>
void void
IdleMonitor::Cancel() noexcept IdleMonitor::Cancel() noexcept
......
src/event/Loop.hxx
View file @ ab9f5d20
...@@ -34,10 +34,9 @@ ...@@ -34,10 +34,9 @@
#include <boost/intrusive/set.hpp> #include <boost/intrusive/set.hpp>
#include <boost/intrusive/list.hpp> #include <boost/intrusive/list.hpp>
#include <chrono>
#include <atomic> #include <atomic>
#include <cassert>
#include <assert.h> #include <chrono>
/** /**
* An event loop that polls for events on file/socket descriptors. * An event loop that polls for events on file/socket descriptors.
......
src/event/MultiSocketMonitor.hxx
View file @ ab9f5d20
...@@ -24,11 +24,10 @@ ...@@ -24,11 +24,10 @@
#include "TimerEvent.hxx" #include "TimerEvent.hxx"
#include "SocketMonitor.hxx" #include "SocketMonitor.hxx"
#include <cassert>
#include <forward_list> #include <forward_list>
#include <iterator> #include <iterator>
#include <assert.h>
#ifndef _WIN32 #ifndef _WIN32
struct pollfd; struct pollfd;
#endif #endif
......
src/event/PollGroupPoll.cxx
View file @ ab9f5d20
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "PollGroupPoll.hxx" #include "PollGroupPoll.hxx"
#include <assert.h> #include <cassert>
PollGroupPoll::PollGroupPoll() noexcept = default; PollGroupPoll::PollGroupPoll() noexcept = default;
PollGroupPoll::~PollGroupPoll() noexcept = default; PollGroupPoll::~PollGroupPoll() noexcept = default;
......
src/event/PollGroupWinSelect.hxx
View file @ ab9f5d20
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#include "PollResultGeneric.hxx" #include "PollResultGeneric.hxx"
#include <assert.h> #include <cassert>
#include <string.h>
#include <unordered_map> #include <unordered_map>
#include <string.h>
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
......
src/event/ServerSocket.cxx
View file @ ab9f5d20
...@@ -35,11 +35,10 @@ ...@@ -35,11 +35,10 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <string> #include <string>
#include <utility> #include <utility>
#include <assert.h>
#ifdef HAVE_UN #ifdef HAVE_UN
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
......
src/event/SignalMonitor.cxx
View file @ ab9f5d20
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
#endif #endif
#include <algorithm> #include <algorithm>
#include <cassert>
#ifdef USE_SIGNALFD #ifdef USE_SIGNALFD
#include <pthread.h> #include <pthread.h>
#endif #endif
#include <assert.h>
#include <signal.h> #include <signal.h>
class SignalMonitor final : private SocketMonitor { class SignalMonitor final : private SocketMonitor {
......
src/event/SocketMonitor.cxx
View file @ ab9f5d20
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "SocketMonitor.hxx" #include "SocketMonitor.hxx"
#include "Loop.hxx" #include "Loop.hxx"
#include <cassert>
#include <utility> #include <utility>
#include <assert.h>
void void
SocketMonitor::Dispatch(unsigned flags) noexcept SocketMonitor::Dispatch(unsigned flags) noexcept
{ {
......
src/event/SocketMonitor.hxx
View file @ ab9f5d20
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "PollGroup.hxx" #include "PollGroup.hxx"
#include "net/SocketDescriptor.hxx" #include "net/SocketDescriptor.hxx"
#include <cassert>
#include <type_traits> #include <type_traits>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
class EventLoop; class EventLoop;
......
src/filter/Filter.hxx
View file @ ab9f5d20
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include <assert.h> #include <cassert>
template<typename T> struct ConstBuffer; template<typename T> struct ConstBuffer;
......
src/filter/Observer.cxx
View file @ ab9f5d20
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "Prepared.hxx" #include "Prepared.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <assert.h> #include <cassert>
class FilterObserver::PreparedProxy final : public PreparedFilter { class FilterObserver::PreparedProxy final : public PreparedFilter {
FilterObserver &observer; FilterObserver &observer;
......
src/filter/plugins/AutoConvertFilterPlugin.cxx
View file @ ab9f5d20
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <assert.h>
class AutoConvertFilter final : public Filter { class AutoConvertFilter final : public Filter {
/** /**
* The underlying filter. * The underlying filter.
......
src/filter/plugins/ChainFilterPlugin.cxx
View file @ ab9f5d20
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <memory> #include <cassert>
#include <list> #include <list>
#include <memory>
#include <assert.h>
class ChainFilter final : public Filter { class ChainFilter final : public Filter {
struct Child { struct Child {
......
src/filter/plugins/ConvertFilterPlugin.cxx
View file @ ab9f5d20
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
#include "pcm/Convert.hxx" #include "pcm/Convert.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <cassert>
#include <memory> #include <memory>
#include <assert.h>
class ConvertFilter final : public Filter { class ConvertFilter final : public Filter {
/** /**
* The input audio format; PCM data is passed to the filter() * The input audio format; PCM data is passed to the filter()
......
src/filter/plugins/ReplayGainFilterPlugin.cxx
View file @ ab9f5d20
...@@ -29,10 +29,9 @@ ...@@ -29,10 +29,9 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <cassert>
#include <exception> #include <exception>
#include <assert.h>
static constexpr Domain replay_gain_domain("replay_gain"); static constexpr Domain replay_gain_domain("replay_gain");
class ReplayGainFilter final : public Filter { class ReplayGainFilter final : public Filter {
......
src/fs/Charset.cxx
View file @ ab9f5d20
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
#endif #endif
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#ifdef HAVE_FS_CHARSET #ifdef HAVE_FS_CHARSET
......
src/fs/Path.hxx
View file @ ab9f5d20
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#include "Traits.hxx" #include "Traits.hxx"
#include <cassert>
#include <string> #include <string>
#include <assert.h>
class AllocatedPath; class AllocatedPath;
/** /**
......
src/fs/Traits.hxx
View file @ ab9f5d20
...@@ -29,10 +29,9 @@ ...@@ -29,10 +29,9 @@
#include <tchar.h> #include <tchar.h>
#endif #endif
#include <cassert>
#include <string> #include <string>
#include <assert.h>
#ifdef _WIN32 #ifdef _WIN32
#define PATH_LITERAL(s) _T(s) #define PATH_LITERAL(s) _T(s)
#else #else
......
src/fs/io/FileOutputStream.hxx
View file @ ab9f5d20
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
#include "system/FileDescriptor.hxx" #include "system/FileDescriptor.hxx"
#endif #endif
#include <assert.h> #include <cassert>
#include <stdint.h> #include <stdint.h>
#ifdef _WIN32 #ifdef _WIN32
......
src/fs/io/FileReader.cxx
View file @ ab9f5d20
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "system/Error.hxx" #include "system/Error.hxx"
#include "system/Open.hxx" #include "system/Open.hxx"
#include <assert.h> #include <cassert>
#ifdef _WIN32 #ifdef _WIN32
......
src/fs/io/PeekReader.cxx
View file @ ab9f5d20
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "PeekReader.hxx" #include "PeekReader.hxx"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <assert.h>
#include <string.h> #include <string.h>
const void * const void *
......
src/fs/io/TextFile.cxx
View file @ ab9f5d20
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "BufferedReader.hxx" #include "BufferedReader.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include <assert.h> #include <cassert>
TextFile::TextFile(Path path_fs) TextFile::TextFile(Path path_fs)
:file_reader(std::make_unique<FileReader>(path_fs)), :file_reader(std::make_unique<FileReader>(path_fs)),
......
src/input/AsyncInputStream.cxx
View file @ ab9f5d20
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
#include <string.h> #include <string.h>
AsyncInputStream::AsyncInputStream(EventLoop &event_loop, const char *_url, AsyncInputStream::AsyncInputStream(EventLoop &event_loop, const char *_url,
......
src/input/BufferedInputStream.hxx
View file @ ab9f5d20
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "InputStream.hxx" #include "InputStream.hxx"
#include "BufferingInputStream.hxx" #include "BufferingInputStream.hxx"
#include <assert.h> #include <cassert>
/** /**
* A "huge" buffer which remembers the (partial) contents of an * A "huge" buffer which remembers the (partial) contents of an
......
src/input/Init.cxx
View file @ ab9f5d20
...@@ -27,10 +27,9 @@ ...@@ -27,10 +27,9 @@
#include "PluginUnavailable.hxx" #include "PluginUnavailable.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
void void
input_stream_global_init(const ConfigData &config, EventLoop &event_loop) input_stream_global_init(const ConfigData &config, EventLoop &event_loop)
{ {
......
src/input/InputPlugin.cxx
View file @ ab9f5d20
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "InputPlugin.hxx" #include "InputPlugin.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include <assert.h>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <iterator> #include <iterator>
bool bool
...@@ -71,4 +71,4 @@ protocol_is_whitelisted(const char *proto) { ...@@ -71,4 +71,4 @@ protocol_is_whitelisted(const char *proto) {
return std::binary_search(begin, end, proto, [](const char* a, const char* b) { return std::binary_search(begin, end, proto, [](const char* a, const char* b) {
return strcasecmp(a,b) < 0; return strcasecmp(a,b) < 0;
}); });
} }
\ No newline at end of file
src/input/InputPlugin.hxx
View file @ ab9f5d20
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include "Ptr.hxx" #include "Ptr.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <assert.h>
#include <cassert>
#include <set> #include <set>
#include <string> #include <string>
......
src/input/InputStream.cxx
View file @ ab9f5d20
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include <cassert>
#include <stdexcept> #include <stdexcept>
#include <assert.h>
InputStream::~InputStream() noexcept = default; InputStream::~InputStream() noexcept = default;
void void
......
src/input/InputStream.hxx
View file @ ab9f5d20
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <string> #include <cassert>
#include <memory> #include <memory>
#include <string>
#include <assert.h>
struct Tag; struct Tag;
class InputStreamHandler; class InputStreamHandler;
......
src/input/LocalOpen.cxx
View file @ ab9f5d20
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include <assert.h> #include <cassert>
InputStreamPtr InputStreamPtr
OpenLocalInputStream(Path path, Mutex &mutex) OpenLocalInputStream(Path path, Mutex &mutex)
......
src/input/RewindInputStream.cxx
View file @ ab9f5d20
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
#include "RewindInputStream.hxx" #include "RewindInputStream.hxx"
#include "ProxyInputStream.hxx" #include "ProxyInputStream.hxx"
#include <assert.h> #include <cassert>
#include <string.h> #include <string.h>
class RewindInputStream final : public ProxyInputStream { class RewindInputStream final : public ProxyInputStream {
......
src/input/TextInputStream.cxx
View file @ ab9f5d20
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "InputStream.hxx" #include "InputStream.hxx"
#include "util/TextFile.hxx" #include "util/TextFile.hxx"
#include <assert.h> #include <cassert>
TextInputStream::TextInputStream(InputStreamPtr &&_is) noexcept TextInputStream::TextInputStream(InputStreamPtr &&_is) noexcept
:is(std::move(_is)) {} :is(std::move(_is)) {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment