oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

*: use nullptr instead of NULL

Browse Source
This commit is contained in:
Max Kellermann 2020-02-01 13:49:19 +01:00
parent 4c52001a35
commit 4f22f4d357
17 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Permission.cxx
View File

@ -92,7 +92,7 @@ initPermissions(const ConfigData &config)
const char *separator = strchr(value, const char *separator = strchr(value,
PERMISSION_PASSWORD_CHAR); PERMISSION_PASSWORD_CHAR);
if (separator == NULL) if (separator == nullptr)
throw FormatRuntimeError("\"%c\" not found in password string", throw FormatRuntimeError("\"%c\" not found in password string",
PERMISSION_PASSWORD_CHAR); PERMISSION_PASSWORD_CHAR);

6
src/db/plugins/upnp/ContentDirectoryService.cxx
View File

@ -62,7 +62,7 @@ ContentDirectoryService::readDirSlice(UpnpClient_Handle hdl,
IXML_Document *response; IXML_Document *response;
int code = UpnpSendAction(hdl, m_actionURL.c_str(), m_serviceType.c_str(), int code = UpnpSendAction(hdl, m_actionURL.c_str(), m_serviceType.c_str(),
0 /*devUDN*/, request, &response); nullptr /*devUDN*/, request, &response);
if (code != UPNP_E_SUCCESS) if (code != UPNP_E_SUCCESS)
throw FormatRuntimeError("UpnpSendAction() failed: %s", throw FormatRuntimeError("UpnpSendAction() failed: %s",
UpnpGetErrorMessage(code)); UpnpGetErrorMessage(code));
@ -121,7 +121,7 @@ ContentDirectoryService::search(UpnpClient_Handle hdl,
IXML_Document *_response; IXML_Document *_response;
auto code = UpnpSendAction(hdl, m_actionURL.c_str(), auto code = UpnpSendAction(hdl, m_actionURL.c_str(),
m_serviceType.c_str(), m_serviceType.c_str(),
0 /*devUDN*/, nullptr /*devUDN*/,
request.get(), &_response); request.get(), &_response);
if (code != UPNP_E_SUCCESS) if (code != UPNP_E_SUCCESS)
throw FormatRuntimeError("UpnpSendAction() failed: %s", throw FormatRuntimeError("UpnpSendAction() failed: %s",
@ -167,7 +167,7 @@ ContentDirectoryService::getMetadata(UpnpClient_Handle hdl,
IXML_Document *_response; IXML_Document *_response;
auto code = UpnpSendAction(hdl, m_actionURL.c_str(), auto code = UpnpSendAction(hdl, m_actionURL.c_str(),
m_serviceType.c_str(), m_serviceType.c_str(),
0 /*devUDN*/, request.get(), &_response); nullptr /*devUDN*/, request.get(), &_response);
if (code != UPNP_E_SUCCESS) if (code != UPNP_E_SUCCESS)
throw FormatRuntimeError("UpnpSendAction() failed: %s", throw FormatRuntimeError("UpnpSendAction() failed: %s",
UpnpGetErrorMessage(code)); UpnpGetErrorMessage(code));

12
src/input/plugins/AlsaInputPlugin.cxx
View File

@ -355,18 +355,18 @@ AlsaInputStream::ConfigureCapture(AudioFormat audio_format)
snd_pcm_hw_params_get_buffer_size_min(hw_params, &buffer_size_min); snd_pcm_hw_params_get_buffer_size_min(hw_params, &buffer_size_min);
snd_pcm_hw_params_get_buffer_size_max(hw_params, &buffer_size_max); snd_pcm_hw_params_get_buffer_size_max(hw_params, &buffer_size_max);
unsigned buffer_time_min, buffer_time_max; unsigned buffer_time_min, buffer_time_max;
snd_pcm_hw_params_get_buffer_time_min(hw_params, &buffer_time_min, 0); snd_pcm_hw_params_get_buffer_time_min(hw_params, &buffer_time_min, nullptr);
snd_pcm_hw_params_get_buffer_time_max(hw_params, &buffer_time_max, 0); snd_pcm_hw_params_get_buffer_time_max(hw_params, &buffer_time_max, nullptr);
FormatDebug(alsa_input_domain, "buffer: size=%u..%u time=%u..%u", FormatDebug(alsa_input_domain, "buffer: size=%u..%u time=%u..%u",
(unsigned)buffer_size_min, (unsigned)buffer_size_max, (unsigned)buffer_size_min, (unsigned)buffer_size_max,
buffer_time_min, buffer_time_max); buffer_time_min, buffer_time_max);
snd_pcm_uframes_t period_size_min, period_size_max; snd_pcm_uframes_t period_size_min, period_size_max;
snd_pcm_hw_params_get_period_size_min(hw_params, &period_size_min, 0); snd_pcm_hw_params_get_period_size_min(hw_params, &period_size_min, nullptr);
snd_pcm_hw_params_get_period_size_max(hw_params, &period_size_max, 0); snd_pcm_hw_params_get_period_size_max(hw_params, &period_size_max, nullptr);
unsigned period_time_min, period_time_max; unsigned period_time_min, period_time_max;
snd_pcm_hw_params_get_period_time_min(hw_params, &period_time_min, 0); snd_pcm_hw_params_get_period_time_min(hw_params, &period_time_min, nullptr);
snd_pcm_hw_params_get_period_time_max(hw_params, &period_time_max, 0); snd_pcm_hw_params_get_period_time_max(hw_params, &period_time_max, nullptr);
FormatDebug(alsa_input_domain, "period: size=%u..%u time=%u..%u", FormatDebug(alsa_input_domain, "period: size=%u..%u time=%u..%u",
(unsigned)period_size_min, (unsigned)period_size_max, (unsigned)period_size_min, (unsigned)period_size_max,
period_time_min, period_time_max); period_time_min, period_time_max);

12
src/lib/alsa/HwSetup.cxx
View File

@ -233,18 +233,18 @@ SetupHw(snd_pcm_t *pcm,
snd_pcm_hw_params_get_buffer_size_min(hwparams, &buffer_size_min); snd_pcm_hw_params_get_buffer_size_min(hwparams, &buffer_size_min);
snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size_max); snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size_max);
unsigned buffer_time_min, buffer_time_max; unsigned buffer_time_min, buffer_time_max;
snd_pcm_hw_params_get_buffer_time_min(hwparams, &buffer_time_min, 0); snd_pcm_hw_params_get_buffer_time_min(hwparams, &buffer_time_min, nullptr);
snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time_max, 0); snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time_max, nullptr);
FormatDebug(alsa_output_domain, "buffer: size=%u..%u time=%u..%u", FormatDebug(alsa_output_domain, "buffer: size=%u..%u time=%u..%u",
(unsigned)buffer_size_min, (unsigned)buffer_size_max, (unsigned)buffer_size_min, (unsigned)buffer_size_max,
buffer_time_min, buffer_time_max); buffer_time_min, buffer_time_max);
snd_pcm_uframes_t period_size_min, period_size_max; snd_pcm_uframes_t period_size_min, period_size_max;
snd_pcm_hw_params_get_period_size_min(hwparams, &period_size_min, 0); snd_pcm_hw_params_get_period_size_min(hwparams, &period_size_min, nullptr);
snd_pcm_hw_params_get_period_size_max(hwparams, &period_size_max, 0); snd_pcm_hw_params_get_period_size_max(hwparams, &period_size_max, nullptr);
unsigned period_time_min, period_time_max; unsigned period_time_min, period_time_max;
snd_pcm_hw_params_get_period_time_min(hwparams, &period_time_min, 0); snd_pcm_hw_params_get_period_time_min(hwparams, &period_time_min, nullptr);
snd_pcm_hw_params_get_period_time_max(hwparams, &period_time_max, 0); snd_pcm_hw_params_get_period_time_max(hwparams, &period_time_max, nullptr);
FormatDebug(alsa_output_domain, "period: size=%u..%u time=%u..%u", FormatDebug(alsa_output_domain, "period: size=%u..%u time=%u..%u",
(unsigned)period_size_min, (unsigned)period_size_max, (unsigned)period_size_min, (unsigned)period_size_max,
period_time_min, period_time_max); period_time_min, period_time_max);

2
src/lib/upnp/ContentDirectoryService.cxx
View File

@ -61,7 +61,7 @@ ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const
IXML_Document *_response; IXML_Document *_response;
auto code = UpnpSendAction(hdl, m_actionURL.c_str(), auto code = UpnpSendAction(hdl, m_actionURL.c_str(),
m_serviceType.c_str(), m_serviceType.c_str(),
0 /*devUDN*/, request.get(), &_response); nullptr /*devUDN*/, request.get(), &_response);
if (code != UPNP_E_SUCCESS) if (code != UPNP_E_SUCCESS)
throw FormatRuntimeError("UpnpSendAction() failed: %s", throw FormatRuntimeError("UpnpSendAction() failed: %s",
UpnpGetErrorMessage(code)); UpnpGetErrorMessage(code));

2
src/mixer/MixerType.cxx
View File

@ -27,7 +27,7 @@
MixerType MixerType
mixer_type_parse(const char *input) mixer_type_parse(const char *input)
{ {
assert(input != NULL); assert(input != nullptr);
if (strcmp(input, "none") == 0 || strcmp(input, "disabled") == 0) if (strcmp(input, "none") == 0 || strcmp(input, "disabled") == 0)
return MixerType::NONE; return MixerType::NONE;

2
src/output/State.cxx
View File

@ -69,7 +69,7 @@ audio_output_state_read(const char *line, MultipleOutputs &outputs)
name = endptr + 1; name = endptr + 1;
auto *ao = outputs.FindByName(name); auto *ao = outputs.FindByName(name);
if (ao == NULL) { if (ao == nullptr) {
FormatDebug(output_domain, FormatDebug(output_domain,
"Ignoring device state for '%s'", name); "Ignoring device state for '%s'", name);
return true; return true;

2
src/unix/SignalHandlers.cxx
View File

@ -42,7 +42,7 @@ HandleShutdownSignal(void *ctx) noexcept
static void static void
x_sigaction(int signum, const struct sigaction *act) x_sigaction(int signum, const struct sigaction *act)
{ {
if (sigaction(signum, act, NULL) < 0) if (sigaction(signum, act, nullptr) < 0)
throw MakeErrno("sigaction() failed"); throw MakeErrno("sigaction() failed");
} }

2
src/util/FormatString.cxx
View File

@ -28,7 +28,7 @@ FormatStringV(const char *fmt, va_list args) noexcept
{ {
va_list tmp; va_list tmp;
va_copy(tmp, args); va_copy(tmp, args);
const int length = vsnprintf(NULL, 0, fmt, tmp); const int length = vsnprintf(nullptr, 0, fmt, tmp);
va_end(tmp); va_end(tmp);
if (length <= 0) if (length <= 0)

2
test/DumpDatabase.cxx
View File

@ -110,7 +110,7 @@ try {
const char *const plugin_name = argv[2]; const char *const plugin_name = argv[2];
const DatabasePlugin *plugin = GetDatabasePluginByName(plugin_name); const DatabasePlugin *plugin = GetDatabasePluginByName(plugin_name);
if (plugin == NULL) { if (plugin == nullptr) {
cerr << "No such database plugin: " << plugin_name << endl; cerr << "No such database plugin: " << plugin_name << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

6
test/dump_playlist.cxx
View File

@ -74,7 +74,7 @@ try {
InputStreamPtr is; InputStreamPtr is;
auto playlist = playlist_list_open_uri(uri, mutex); auto playlist = playlist_list_open_uri(uri, mutex);
if (playlist == NULL) { if (playlist == nullptr) {
/* open the stream and wait until it becomes ready */ /* open the stream and wait until it becomes ready */
is = InputStream::OpenReady(uri, mutex); is = InputStream::OpenReady(uri, mutex);
@ -82,7 +82,7 @@ try {
/* open the playlist */ /* open the playlist */
playlist = playlist_list_open_stream(std::move(is), uri); playlist = playlist_list_open_stream(std::move(is), uri);
if (playlist == NULL) { if (playlist == nullptr) {
fprintf(stderr, "Failed to open playlist\n"); fprintf(stderr, "Failed to open playlist\n");
return 2; return 2;
} }
@ -91,7 +91,7 @@ try {
/* dump the playlist */ /* dump the playlist */
std::unique_ptr<DetachedSong> song; std::unique_ptr<DetachedSong> song;
while ((song = playlist->NextSong()) != NULL) { while ((song = playlist->NextSong()) != nullptr) {
printf("%s\n", song->GetURI()); printf("%s\n", song->GetURI());
const unsigned start_ms = song->GetStartTime().ToMS(); const unsigned start_ms = song->GetStartTime().ToMS();

2
test/dump_rva2.cxx
View File

@ -70,7 +70,7 @@ try {
auto is = OpenLocalInputStream(path, mutex); auto is = OpenLocalInputStream(path, mutex);
const auto tag = tag_id3_load(*is); const auto tag = tag_id3_load(*is);
if (tag == NULL) { if (tag == nullptr) {
fprintf(stderr, "No ID3 tag found\n"); fprintf(stderr, "No ID3 tag found\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
test/read_mixer.cxx
View File

@ -32,7 +32,7 @@ const FilterPlugin *
filter_plugin_by_name(gcc_unused const char *name) noexcept filter_plugin_by_name(gcc_unused const char *name) noexcept
{ {
assert(false); assert(false);
return NULL; return nullptr;
} }
int main(int argc, gcc_unused char **argv) int main(int argc, gcc_unused char **argv)

4
test/read_tags.cxx
View File

@ -108,7 +108,7 @@ try {
const ScopeDecoderPluginsInit decoder_plugins_init({}); const ScopeDecoderPluginsInit decoder_plugins_init({});
plugin = decoder_plugin_from_name(decoder_name); plugin = decoder_plugin_from_name(decoder_name);
if (plugin == NULL) { if (plugin == nullptr) {
fprintf(stderr, "No such decoder: %s\n", decoder_name); fprintf(stderr, "No such decoder: %s\n", decoder_name);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -125,7 +125,7 @@ try {
Mutex mutex; Mutex mutex;
InputStreamPtr is; InputStreamPtr is;
if (!success && plugin->scan_stream != NULL) { if (!success && plugin->scan_stream != nullptr) {
is = InputStream::OpenReady(path.c_str(), mutex); is = InputStream::OpenReady(path.c_str(), mutex);
success = plugin->ScanStream(*is, h); success = plugin->ScanStream(*is, h);
} }

2
test/run_encoder.cxx
View File

@ -55,7 +55,7 @@ try {
/* create the encoder */ /* create the encoder */
const auto plugin = encoder_plugin_get(encoder_name); const auto plugin = encoder_plugin_get(encoder_name);
if (plugin == NULL) { if (plugin == nullptr) {
fprintf(stderr, "No such encoder: %s\n", encoder_name); fprintf(stderr, "No such encoder: %s\n", encoder_name);
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
test/run_filter.cxx
View File

@ -52,7 +52,7 @@ LoadFilter(const ConfigData &config, const char *name)
{ {
const auto *param = config.FindBlock(ConfigBlockOption::AUDIO_FILTER, const auto *param = config.FindBlock(ConfigBlockOption::AUDIO_FILTER,
"name", name); "name", name);
if (param == NULL) if (param == nullptr)
throw FormatRuntimeError("No such configured filter: %s", throw FormatRuntimeError("No such configured filter: %s",
name); name);

2
test/test_vorbis_encoder.cxx
View File

@ -41,7 +41,7 @@ try {
/* create the encoder */ /* create the encoder */
const auto plugin = encoder_plugin_get("vorbis"); const auto plugin = encoder_plugin_get("vorbis");
assert(plugin != NULL); assert(plugin != nullptr);
ConfigBlock block; ConfigBlock block;
block.AddBlockParam("quality", "5.0", -1); block.AddBlockParam("quality", "5.0", -1);