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

output/oss: use nullptr instead of NULL

This commit is contained in:
Max Kellermann 2015-01-07 18:55:31 +01:00
parent dc03ad05be
commit d83127722f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/plugins/OssOutputPlugin.cxx
View File

@ -199,7 +199,7 @@ oss_open_default(Error &error)
OssOutput *od = new OssOutput(default_devices[i]); OssOutput *od = new OssOutput(default_devices[i]);
if (!od->Initialize(empty, error)) { if (!od->Initialize(empty, error)) {
delete od; delete od;
return NULL; return nullptr;
} }
return od; return od;
@ -232,18 +232,18 @@ oss_open_default(Error &error)
error.Set(oss_output_domain, error.Set(oss_output_domain,
"error trying to open default OSS device"); "error trying to open default OSS device");
return NULL; return nullptr;
} }
inline OssOutput * inline OssOutput *
OssOutput::Create(const config_param &param, Error &error) OssOutput::Create(const config_param &param, Error &error)
{ {
const char *device = param.GetBlockValue("device"); const char *device = param.GetBlockValue("device");
if (device != NULL) { if (device != nullptr) {
OssOutput *od = new OssOutput(); OssOutput *od = new OssOutput();
if (!od->Initialize(param, error)) { if (!od->Initialize(param, error)) {
delete od; delete od;
return NULL; return nullptr;
} }
od->device = device; od->device = device;
@ -280,8 +280,8 @@ oss_try_ioctl_r(int fd, unsigned long request, int *value_r,
const char *msg, Error &error) const char *msg, Error &error)
{ {
assert(fd >= 0); assert(fd >= 0);
assert(value_r != NULL); assert(value_r != nullptr);
assert(msg != NULL); assert(msg != nullptr);
assert(!error.IsDefined()); assert(!error.IsDefined());
int ret = ioctl(fd, request, value_r); int ret = ioctl(fd, request, value_r);