summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/ldverify.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-04 07:06:18 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-04 07:06:18 +0100
commit5a2f80dcde2e76356bf568f1e2d71b054a7db45b (patch)
tree31e8369980a2e4548223f529c31e8ca6ade5ce20 /src/tools/ldverify.cpp
parent41681c1703244abe68cbcf3096ca259bd061cc08 (diff)
clang-modernize part 5
Diffstat (limited to 'src/tools/ldverify.cpp')
-rw-r--r--src/tools/ldverify.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/ldverify.cpp b/src/tools/ldverify.cpp
index 020e611181c..ab3947dfaea 100644
--- a/src/tools/ldverify.cpp
+++ b/src/tools/ldverify.cpp
@@ -107,7 +107,7 @@ static void *open_avi(const char *filename, movie_info &info)
if (avierr != AVIERR_NONE)
{
fprintf(stderr, "Error opening AVI file: %s\n", avi_error_string(avierr));
- return NULL;
+ return nullptr;
}
// extract movie info
@@ -171,7 +171,7 @@ static void close_avi(void *file)
static void *open_chd(const char *filename, movie_info &info)
{
- chd_file *chd = new chd_file;
+ auto chd = new chd_file;
// open the file
chd_error chderr = chd->open(filename);
@@ -179,7 +179,7 @@ static void *open_chd(const char *filename, movie_info &info)
{
fprintf(stderr, "Error opening CHD file: %s\n", chd_file::error_string(chderr));
delete chd;
- return NULL;
+ return nullptr;
}
// get the metadata
@@ -189,7 +189,7 @@ static void *open_chd(const char *filename, movie_info &info)
{
fprintf(stderr, "Error getting A/V metadata: %s\n", chd_file::error_string(chderr));
delete chd;
- return NULL;
+ return nullptr;
}
// extract the info
@@ -198,7 +198,7 @@ static void *open_chd(const char *filename, movie_info &info)
{
fprintf(stderr, "Improperly formatted metadata\n");
delete chd;
- return NULL;
+ return nullptr;
}
// extract movie info
@@ -249,7 +249,7 @@ static int read_chd(void *file, int frame, bitmap_yuy16 &bitmap, INT16 *lsound,
chdfile->codec_configure(CHD_CODEC_AVHUFF, AVHUFF_CODEC_DECOMPRESS_CONFIG, &avconfig);
// read the frame
- chd_error chderr = chdfile->read_hunk(frame * interlace_factor + fieldnum, NULL);
+ chd_error chderr = chdfile->read_hunk(frame * interlace_factor + fieldnum, nullptr);
if (chderr != CHDERR_NONE)
return false;
@@ -735,7 +735,7 @@ int main(int argc, char *argv[])
printf("Processing file: %s\n", srcfile);
movie_info info = { 0 };
void *file = isavi ? open_avi(srcfile, info) : open_chd(srcfile, info);
- if (file == NULL)
+ if (file == nullptr)
{
fprintf(stderr, "Unable to open file '%s'\n", srcfile);
return 1;