Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
540919f2
Commit
540919f2
authored
Feb 01, 2020
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: use nullptr instead of NULL
parent
398281cd
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
32 additions
and
32 deletions
+32
-32
Permission.cxx
src/Permission.cxx
+1
-1
ContentDirectoryService.cxx
src/db/plugins/upnp/ContentDirectoryService.cxx
+3
-3
AlsaInputPlugin.cxx
src/input/plugins/AlsaInputPlugin.cxx
+6
-6
HwSetup.cxx
src/lib/alsa/HwSetup.cxx
+6
-6
ContentDirectoryService.cxx
src/lib/upnp/ContentDirectoryService.cxx
+1
-1
MixerType.cxx
src/mixer/MixerType.cxx
+1
-1
State.cxx
src/output/State.cxx
+1
-1
SignalHandlers.cxx
src/unix/SignalHandlers.cxx
+1
-1
FormatString.cxx
src/util/FormatString.cxx
+1
-1
DumpDatabase.cxx
test/DumpDatabase.cxx
+1
-1
dump_playlist.cxx
test/dump_playlist.cxx
+3
-3
dump_rva2.cxx
test/dump_rva2.cxx
+1
-1
read_mixer.cxx
test/read_mixer.cxx
+1
-1
read_tags.cxx
test/read_tags.cxx
+2
-2
run_encoder.cxx
test/run_encoder.cxx
+1
-1
run_filter.cxx
test/run_filter.cxx
+1
-1
test_vorbis_encoder.cxx
test/test_vorbis_encoder.cxx
+1
-1
No files found.
src/Permission.cxx
View file @
540919f2
...
...
@@ -101,7 +101,7 @@ initPermissions(const ConfigData &config)
const
char
*
separator
=
strchr
(
param
.
value
.
c_str
(),
PERMISSION_PASSWORD_CHAR
);
if
(
separator
==
NULL
)
if
(
separator
==
nullptr
)
throw
FormatRuntimeError
(
"
\"
%c
\"
not found in password string "
"
\"
%s
\"
, line %i"
,
PERMISSION_PASSWORD_CHAR
,
...
...
src/db/plugins/upnp/ContentDirectoryService.cxx
View file @
540919f2
...
...
@@ -65,7 +65,7 @@ ContentDirectoryService::readDirSlice(UpnpClient_Handle hdl,
IXML_Document
*
response
;
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
)
throw
FormatRuntimeError
(
"UpnpSendAction() failed: %s"
,
UpnpGetErrorMessage
(
code
));
...
...
@@ -124,7 +124,7 @@ ContentDirectoryService::search(UpnpClient_Handle hdl,
IXML_Document
*
_response
;
auto
code
=
UpnpSendAction
(
hdl
,
m_actionURL
.
c_str
(),
m_serviceType
.
c_str
(),
0
/*devUDN*/
,
nullptr
/*devUDN*/
,
request
.
get
(),
&
_response
);
if
(
code
!=
UPNP_E_SUCCESS
)
throw
FormatRuntimeError
(
"UpnpSendAction() failed: %s"
,
...
...
@@ -170,7 +170,7 @@ ContentDirectoryService::getMetadata(UpnpClient_Handle hdl,
IXML_Document
*
_response
;
auto
code
=
UpnpSendAction
(
hdl
,
m_actionURL
.
c_str
(),
m_serviceType
.
c_str
(),
0
/*devUDN*/
,
request
.
get
(),
&
_response
);
nullptr
/*devUDN*/
,
request
.
get
(),
&
_response
);
if
(
code
!=
UPNP_E_SUCCESS
)
throw
FormatRuntimeError
(
"UpnpSendAction() failed: %s"
,
UpnpGetErrorMessage
(
code
));
...
...
src/input/plugins/AlsaInputPlugin.cxx
View file @
540919f2
...
...
@@ -305,18 +305,18 @@ ConfigureCapture(snd_pcm_t *capture_handle,
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
);
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_max
(
hw_params
,
&
buffer_time_max
,
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
,
nullptr
);
FormatDebug
(
alsa_input_domain
,
"buffer: size=%u..%u time=%u..%u"
,
(
unsigned
)
buffer_size_min
,
(
unsigned
)
buffer_size_max
,
buffer_time_min
,
buffer_time_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_max
(
hw_params
,
&
period_size_max
,
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
,
nullptr
);
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_max
(
hw_params
,
&
period_time_max
,
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
,
nullptr
);
FormatDebug
(
alsa_input_domain
,
"period: size=%u..%u time=%u..%u"
,
(
unsigned
)
period_size_min
,
(
unsigned
)
period_size_max
,
period_time_min
,
period_time_max
);
...
...
src/lib/alsa/HwSetup.cxx
View file @
540919f2
...
...
@@ -238,18 +238,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_max
(
hwparams
,
&
buffer_size_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_max
(
hwparams
,
&
buffer_time_max
,
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
,
nullptr
);
FormatDebug
(
alsa_output_domain
,
"buffer: size=%u..%u time=%u..%u"
,
(
unsigned
)
buffer_size_min
,
(
unsigned
)
buffer_size_max
,
buffer_time_min
,
buffer_time_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_max
(
hwparams
,
&
period_size_max
,
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
,
nullptr
);
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_max
(
hwparams
,
&
period_time_max
,
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
,
nullptr
);
FormatDebug
(
alsa_output_domain
,
"period: size=%u..%u time=%u..%u"
,
(
unsigned
)
period_size_min
,
(
unsigned
)
period_size_max
,
period_time_min
,
period_time_max
);
...
...
src/lib/upnp/ContentDirectoryService.cxx
View file @
540919f2
...
...
@@ -60,7 +60,7 @@ ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const
IXML_Document
*
_response
;
auto
code
=
UpnpSendAction
(
hdl
,
m_actionURL
.
c_str
(),
m_serviceType
.
c_str
(),
0
/*devUDN*/
,
request
.
get
(),
&
_response
);
nullptr
/*devUDN*/
,
request
.
get
(),
&
_response
);
if
(
code
!=
UPNP_E_SUCCESS
)
throw
FormatRuntimeError
(
"UpnpSendAction() failed: %s"
,
UpnpGetErrorMessage
(
code
));
...
...
src/mixer/MixerType.cxx
View file @
540919f2
...
...
@@ -27,7 +27,7 @@
MixerType
mixer_type_parse
(
const
char
*
input
)
{
assert
(
input
!=
NULL
);
assert
(
input
!=
nullptr
);
if
(
strcmp
(
input
,
"none"
)
==
0
||
strcmp
(
input
,
"disabled"
)
==
0
)
return
MixerType
::
NONE
;
...
...
src/output/State.cxx
View file @
540919f2
...
...
@@ -70,7 +70,7 @@ audio_output_state_read(const char *line, MultipleOutputs &outputs)
name
=
endptr
+
1
;
auto
*
ao
=
outputs
.
FindByName
(
name
);
if
(
ao
==
NULL
)
{
if
(
ao
==
nullptr
)
{
FormatDebug
(
output_domain
,
"Ignoring device state for '%s'"
,
name
);
return
true
;
...
...
src/unix/SignalHandlers.cxx
View file @
540919f2
...
...
@@ -42,7 +42,7 @@ HandleShutdownSignal(void *ctx) noexcept
static
void
x_sigaction
(
int
signum
,
const
struct
sigaction
*
act
)
{
if
(
sigaction
(
signum
,
act
,
NULL
)
<
0
)
if
(
sigaction
(
signum
,
act
,
nullptr
)
<
0
)
throw
MakeErrno
(
"sigaction() failed"
);
}
...
...
src/util/FormatString.cxx
View file @
540919f2
...
...
@@ -28,7 +28,7 @@ FormatStringV(const char *fmt, va_list args) noexcept
{
va_list
tmp
;
va_copy
(
tmp
,
args
);
const
int
length
=
vsnprintf
(
NULL
,
0
,
fmt
,
tmp
);
const
int
length
=
vsnprintf
(
nullptr
,
0
,
fmt
,
tmp
);
va_end
(
tmp
);
if
(
length
<=
0
)
...
...
test/DumpDatabase.cxx
View file @
540919f2
...
...
@@ -112,7 +112,7 @@ try {
const
char
*
const
plugin_name
=
argv
[
2
];
const
DatabasePlugin
*
plugin
=
GetDatabasePluginByName
(
plugin_name
);
if
(
plugin
==
NULL
)
{
if
(
plugin
==
nullptr
)
{
cerr
<<
"No such database plugin: "
<<
plugin_name
<<
endl
;
return
EXIT_FAILURE
;
}
...
...
test/dump_playlist.cxx
View file @
540919f2
...
...
@@ -75,7 +75,7 @@ try {
InputStreamPtr
is
;
auto
playlist
=
playlist_list_open_uri
(
uri
,
mutex
);
if
(
playlist
==
NULL
)
{
if
(
playlist
==
nullptr
)
{
/* open the stream and wait until it becomes ready */
is
=
InputStream
::
OpenReady
(
uri
,
mutex
);
...
...
@@ -83,7 +83,7 @@ try {
/* open the playlist */
playlist
=
playlist_list_open_stream
(
std
::
move
(
is
),
uri
);
if
(
playlist
==
NULL
)
{
if
(
playlist
==
nullptr
)
{
fprintf
(
stderr
,
"Failed to open playlist
\n
"
);
return
2
;
}
...
...
@@ -92,7 +92,7 @@ try {
/* dump the playlist */
std
::
unique_ptr
<
DetachedSong
>
song
;
while
((
song
=
playlist
->
NextSong
())
!=
NULL
)
{
while
((
song
=
playlist
->
NextSong
())
!=
nullptr
)
{
printf
(
"%s
\n
"
,
song
->
GetURI
());
const
unsigned
start_ms
=
song
->
GetStartTime
().
ToMS
();
...
...
test/dump_rva2.cxx
View file @
540919f2
...
...
@@ -70,7 +70,7 @@ try {
auto
is
=
OpenLocalInputStream
(
path
,
mutex
);
const
auto
tag
=
tag_id3_load
(
*
is
);
if
(
tag
==
NULL
)
{
if
(
tag
==
nullptr
)
{
fprintf
(
stderr
,
"No ID3 tag found
\n
"
);
return
EXIT_FAILURE
;
}
...
...
test/read_mixer.cxx
View file @
540919f2
...
...
@@ -36,7 +36,7 @@ const FilterPlugin *
filter_plugin_by_name
(
gcc_unused
const
char
*
name
)
noexcept
{
assert
(
false
);
return
NULL
;
return
nullptr
;
}
int
main
(
int
argc
,
gcc_unused
char
**
argv
)
...
...
test/read_tags.cxx
View file @
540919f2
...
...
@@ -100,7 +100,7 @@ try {
const
ScopeDecoderPluginsInit
decoder_plugins_init
({});
plugin
=
decoder_plugin_from_name
(
decoder_name
);
if
(
plugin
==
NULL
)
{
if
(
plugin
==
nullptr
)
{
fprintf
(
stderr
,
"No such decoder: %s
\n
"
,
decoder_name
);
return
EXIT_FAILURE
;
}
...
...
@@ -117,7 +117,7 @@ try {
Mutex
mutex
;
InputStreamPtr
is
;
if
(
!
success
&&
plugin
->
scan_stream
!=
NULL
)
{
if
(
!
success
&&
plugin
->
scan_stream
!=
nullptr
)
{
is
=
InputStream
::
OpenReady
(
path
,
mutex
);
success
=
plugin
->
ScanStream
(
*
is
,
h
);
}
...
...
test/run_encoder.cxx
View file @
540919f2
...
...
@@ -55,7 +55,7 @@ try {
/* create the encoder */
const
auto
plugin
=
encoder_plugin_get
(
encoder_name
);
if
(
plugin
==
NULL
)
{
if
(
plugin
==
nullptr
)
{
fprintf
(
stderr
,
"No such encoder: %s
\n
"
,
encoder_name
);
return
EXIT_FAILURE
;
}
...
...
test/run_filter.cxx
View file @
540919f2
...
...
@@ -53,7 +53,7 @@ LoadFilter(const ConfigData &config, const char *name)
{
const
auto
*
param
=
config
.
FindBlock
(
ConfigBlockOption
::
AUDIO_FILTER
,
"name"
,
name
);
if
(
param
==
NULL
)
if
(
param
==
nullptr
)
throw
FormatRuntimeError
(
"No such configured filter: %s"
,
name
);
...
...
test/test_vorbis_encoder.cxx
View file @
540919f2
...
...
@@ -41,7 +41,7 @@ try {
/* create the encoder */
const
auto
plugin
=
encoder_plugin_get
(
"vorbis"
);
assert
(
plugin
!=
NULL
);
assert
(
plugin
!=
nullptr
);
ConfigBlock
block
;
block
.
AddBlockParam
(
"quality"
,
"5.0"
,
-
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment