summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/harddisk.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/lib/util/harddisk.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/lib/util/harddisk.cpp')
-rw-r--r--src/lib/util/harddisk.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/util/harddisk.cpp b/src/lib/util/harddisk.cpp
index b1082f3234f..6bb121f36b2 100644
--- a/src/lib/util/harddisk.cpp
+++ b/src/lib/util/harddisk.cpp
@@ -44,22 +44,22 @@ hard_disk_file *hard_disk_open(chd_file *chd)
chd_error err;
/* punt if no CHD */
- if (chd == NULL)
- return NULL;
+ if (chd == nullptr)
+ return nullptr;
/* read the hard disk metadata */
err = chd->read_metadata(HARD_DISK_METADATA_TAG, 0, metadata);
if (err != CHDERR_NONE)
- return NULL;
+ return nullptr;
/* parse the metadata */
if (sscanf(metadata.c_str(), HARD_DISK_METADATA_FORMAT, &cylinders, &heads, &sectors, &sectorbytes) != 4)
- return NULL;
+ return nullptr;
/* allocate memory for the hard disk file */
file = (hard_disk_file *)malloc(sizeof(hard_disk_file));
- if (file == NULL)
- return NULL;
+ if (file == nullptr)
+ return nullptr;
/* fill in the data */
file->chd = chd;