diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/tools/floptool.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/tools/floptool.cpp')
| -rw-r--r-- | src/tools/floptool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/floptool.cpp b/src/tools/floptool.cpp index 2cb36f3a873..190e2004ea6 100644 --- a/src/tools/floptool.cpp +++ b/src/tools/floptool.cpp @@ -100,13 +100,13 @@ static floppy_image_format_t *find_format_by_name(const char *name) for(int i=0; i != FORMAT_COUNT; i++) if(!core_stricmp(name, formats[i]->name())) return formats[i]; - return 0; + return nullptr; } static floppy_image_format_t *find_format_by_identify(io_generic *image) { int best = 0; - floppy_image_format_t *best_fif = 0; + floppy_image_format_t *best_fif = nullptr; for(int i = 0; i != FORMAT_COUNT; i++) { floppy_image_format_t *fif = formats[i]; |
