diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/lib/formats/basicdsk.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/lib/formats/basicdsk.cpp')
| -rw-r--r-- | src/lib/formats/basicdsk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/formats/basicdsk.cpp b/src/lib/formats/basicdsk.cpp index ee3ed133e91..9c08c97cc2b 100644 --- a/src/lib/formats/basicdsk.cpp +++ b/src/lib/formats/basicdsk.cpp @@ -184,7 +184,7 @@ static floperr_t basicdsk_format_track(floppy_image_legacy *floppy, int head, in { floperr_t err = FLOPPY_ERROR_SUCCESS; UINT8 local_buffer[512]; - void *alloc_buffer = NULL; + void *alloc_buffer = nullptr; void *buffer; UINT32 sector_length; int sector; @@ -206,7 +206,7 @@ static floperr_t basicdsk_format_track(floppy_image_legacy *floppy, int head, in } else { - alloc_buffer = NULL; + alloc_buffer = nullptr; buffer = local_buffer; } @@ -245,7 +245,7 @@ static floperr_t basicdsk_get_sector_length(floppy_image_legacy *floppy, int hea { floperr_t err; - err = get_offset(floppy, head, track, sector, FALSE, NULL); + err = get_offset(floppy, head, track, sector, FALSE, nullptr); if (err) return err; |
