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
d8312772
Commit
d8312772
authored
Jan 07, 2015
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/oss: use nullptr instead of NULL
parent
dc03ad05
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
OssOutputPlugin.cxx
src/output/plugins/OssOutputPlugin.cxx
+6
-6
No files found.
src/output/plugins/OssOutputPlugin.cxx
View file @
d8312772
...
...
@@ -199,7 +199,7 @@ oss_open_default(Error &error)
OssOutput
*
od
=
new
OssOutput
(
default_devices
[
i
]);
if
(
!
od
->
Initialize
(
empty
,
error
))
{
delete
od
;
return
NULL
;
return
nullptr
;
}
return
od
;
...
...
@@ -232,18 +232,18 @@ oss_open_default(Error &error)
error
.
Set
(
oss_output_domain
,
"error trying to open default OSS device"
);
return
NULL
;
return
nullptr
;
}
inline
OssOutput
*
OssOutput
::
Create
(
const
config_param
&
param
,
Error
&
error
)
{
const
char
*
device
=
param
.
GetBlockValue
(
"device"
);
if
(
device
!=
NULL
)
{
if
(
device
!=
nullptr
)
{
OssOutput
*
od
=
new
OssOutput
();
if
(
!
od
->
Initialize
(
param
,
error
))
{
delete
od
;
return
NULL
;
return
nullptr
;
}
od
->
device
=
device
;
...
...
@@ -280,8 +280,8 @@ oss_try_ioctl_r(int fd, unsigned long request, int *value_r,
const
char
*
msg
,
Error
&
error
)
{
assert
(
fd
>=
0
);
assert
(
value_r
!=
NULL
);
assert
(
msg
!=
NULL
);
assert
(
value_r
!=
nullptr
);
assert
(
msg
!=
nullptr
);
assert
(
!
error
.
IsDefined
());
int
ret
=
ioctl
(
fd
,
request
,
value_r
);
...
...
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