From 5a2f80dcde2e76356bf568f1e2d71b054a7db45b Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 4 Dec 2015 07:06:18 +0100 Subject: clang-modernize part 5 --- src/emu/devdelegate.h | 2 +- src/emu/devfind.h | 2 +- src/emu/save.h | 2 +- src/emu/screen.h | 2 +- src/emu/sound/filter.cpp | 4 +- src/emu/sprite.h | 2 +- src/lib/formats/a26_cas.cpp | 4 +- src/lib/formats/ace_tap.cpp | 4 +- src/lib/formats/adam_cas.cpp | 2 +- src/lib/formats/ap2_dsk.cpp | 14 +- src/lib/formats/ap_dsk35.cpp | 18 +- src/lib/formats/apf_apt.cpp | 8 +- src/lib/formats/atari_dsk.cpp | 4 +- src/lib/formats/atom_tap.cpp | 2 +- src/lib/formats/basicdsk.cpp | 6 +- src/lib/formats/camplynx_cas.cpp | 6 +- src/lib/formats/cassimg.cpp | 20 +-- src/lib/formats/cbm_tap.cpp | 10 +- src/lib/formats/ccvf_dsk.cpp | 2 +- src/lib/formats/cgen_cas.cpp | 4 +- src/lib/formats/coco_cas.cpp | 4 +- src/lib/formats/cqm_dsk.cpp | 2 +- src/lib/formats/csw_cas.cpp | 14 +- src/lib/formats/d88_dsk.cpp | 4 +- src/lib/formats/dsk_dsk.cpp | 6 +- src/lib/formats/fc100_cas.cpp | 4 +- src/lib/formats/flopimg.cpp | 36 ++-- src/lib/formats/fm7_cas.cpp | 4 +- src/lib/formats/fmsx_cas.cpp | 2 +- src/lib/formats/gtp_cas.cpp | 8 +- src/lib/formats/hect_dsk.cpp | 6 +- src/lib/formats/hect_tap.cpp | 8 +- src/lib/formats/imageutl.cpp | 2 +- src/lib/formats/imd_dsk.cpp | 10 +- src/lib/formats/ioprocs.cpp | 4 +- src/lib/formats/ipf_dsk.cpp | 6 +- src/lib/formats/kc_cas.cpp | 12 +- src/lib/formats/kim1_cas.cpp | 4 +- src/lib/formats/lviv_lvt.cpp | 2 +- src/lib/formats/mbee_cas.cpp | 4 +- src/lib/formats/mfi_dsk.cpp | 4 +- src/lib/formats/mz_cas.cpp | 4 +- src/lib/formats/nes_dsk.cpp | 4 +- src/lib/formats/orao_cas.cpp | 8 +- src/lib/formats/oric_tap.cpp | 2 +- src/lib/formats/p6001_cas.cpp | 4 +- src/lib/formats/pasti_dsk.cpp | 6 +- src/lib/formats/pc_dsk.cpp | 2 +- src/lib/formats/phc25_cas.cpp | 4 +- src/lib/formats/pmd_cas.cpp | 4 +- src/lib/formats/primoptp.cpp | 2 +- src/lib/formats/rk_cas.cpp | 18 +- src/lib/formats/sc3000_bit.cpp | 2 +- src/lib/formats/sol_cas.cpp | 4 +- src/lib/formats/sorc_cas.cpp | 4 +- src/lib/formats/sorc_dsk.cpp | 4 +- src/lib/formats/sord_cas.cpp | 2 +- src/lib/formats/spc1000_cas.cpp | 8 +- src/lib/formats/svi_cas.cpp | 2 +- src/lib/formats/td0_dsk.cpp | 10 +- src/lib/formats/thom_cas.cpp | 12 +- src/lib/formats/thom_dsk.cpp | 14 +- src/lib/formats/trs_cas.cpp | 4 +- src/lib/formats/tvc_cas.cpp | 2 +- src/lib/formats/tzx_cas.cpp | 14 +- src/lib/formats/uef_cas.cpp | 18 +- src/lib/formats/vg5k_cas.cpp | 4 +- src/lib/formats/vt_cas.cpp | 8 +- src/lib/formats/x07_cas.cpp | 4 +- src/lib/formats/x1_tap.cpp | 2 +- src/lib/formats/zx81_p.cpp | 4 +- src/lib/util/chd.cpp | 2 +- src/lib/util/options.cpp | 2 +- src/lib/util/tagmap.h | 2 +- src/osd/modules/debugger/debugint.cpp | 104 +++++------ src/osd/modules/debugger/none.cpp | 2 +- src/osd/modules/debugger/win/debugbaseinfo.cpp | 4 +- src/osd/modules/debugger/win/debugwininfo.h | 2 +- src/osd/modules/debugger/win/disasmbasewininfo.cpp | 16 +- src/osd/modules/debugger/win/logwininfo.cpp | 4 +- src/osd/modules/lib/osdlib_win32.cpp | 4 +- src/osd/modules/lib/osdobj_common.h | 2 +- src/osd/modules/midi/portmidi.cpp | 6 +- src/osd/modules/osdmodule.cpp | 22 +-- src/osd/modules/render/d3d/d3d9intf.cpp | 28 +-- src/osd/modules/sync/sync_mini.cpp | 4 +- src/osd/modules/sync/sync_windows.cpp | 24 +-- src/osd/modules/sync/work_mini.cpp | 6 +- src/osd/osdcore.cpp | 2 +- src/osd/osdmini/minidir.cpp | 4 +- src/osd/osdmini/minifile.cpp | 18 +- src/osd/osdmini/minimain.cpp | 2 +- src/osd/osdmini/minimisc.cpp | 4 +- src/osd/osdnet.cpp | 6 +- src/osd/sdl/watchdog.cpp | 2 +- src/osd/windows/ledutil.cpp | 50 +++--- src/osd/windows/output.cpp | 26 +-- src/osd/windows/winsocket.cpp | 14 +- src/tools/castool.cpp | 8 +- src/tools/chdman.cpp | 194 ++++++++++---------- src/tools/floptool.cpp | 4 +- src/tools/imgtool/charconv.cpp | 8 +- src/tools/imgtool/filtbas.cpp | 88 ++++----- src/tools/imgtool/filteoln.cpp | 10 +- src/tools/imgtool/filter.cpp | 10 +- src/tools/imgtool/iflopimg.cpp | 12 +- src/tools/imgtool/imghd.cpp | 6 +- src/tools/imgtool/imgtool.cpp | 190 ++++++++++---------- src/tools/imgtool/library.cpp | 12 +- src/tools/imgtool/library.h | 6 +- src/tools/imgtool/main.cpp | 98 +++++----- src/tools/imgtool/modules.cpp | 12 +- src/tools/imgtool/stream.cpp | 44 ++--- src/tools/jedutil.cpp | 198 ++++++++++----------- src/tools/ldresample.cpp | 10 +- src/tools/ldverify.cpp | 14 +- src/tools/pngcmp.cpp | 12 +- src/tools/regrep.cpp | 86 ++++----- src/tools/romcmp.cpp | 24 +-- src/tools/split.cpp | 38 ++-- src/tools/src2html.cpp | 46 ++--- src/tools/srcclean.cpp | 6 +- src/tools/unidasm.cpp | 6 +- 123 files changed, 974 insertions(+), 974 deletions(-) diff --git a/src/emu/devdelegate.h b/src/emu/devdelegate.h index ca4eae7b236..ee8a361ceb9 100644 --- a/src/emu/devdelegate.h +++ b/src/emu/devdelegate.h @@ -65,7 +65,7 @@ public: template device_delegate(typename basetype::template traits<_FunctionClass>::member_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname) { } #ifdef USE_STATIC_DELEGATE template device_delegate(typename basetype::template traits<_FunctionClass>::static_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)0), device_delegate_helper(devname) { } - template device_delegate(typename basetype::template traits<_FunctionClass>::static_ref_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)0), device_delegate_helper(devname) { } + template device_delegate(typename basetype::template traits<_FunctionClass>::static_ref_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname) { } device_delegate(typename basetype::template traits::static_func_type funcptr, const char *name) : basetype(funcptr, name, (device_t *)nullptr), device_delegate_helper(NULL) { } device_delegate(typename basetype::template traits::static_ref_func_type funcptr, const char *name) : basetype(funcptr, name, (device_t *)nullptr), device_delegate_helper(NULL) { } #endif diff --git a/src/emu/devfind.h b/src/emu/devfind.h index d16d7649e89..16dd1f34911 100644 --- a/src/emu/devfind.h +++ b/src/emu/devfind.h @@ -336,7 +336,7 @@ public: { if (isvalidation) return true; this->m_target = reinterpret_cast<_PointerType *>(this->find_memregion(sizeof(_PointerType), m_length, _Required)); - return this->report_missing(this->m_target != NULL, "memory region", _Required); + return this->report_missing(this->m_target != nullptr, "memory region", _Required); } protected: diff --git a/src/emu/save.h b/src/emu/save.h index b82b46ca32f..b4c2c3c2186 100644 --- a/src/emu/save.h +++ b/src/emu/save.h @@ -150,7 +150,7 @@ public: template void save_item(_ItemType &value, const char *valname, int index = 0) { save_item(nullptr, "global", nullptr, index, value, valname); } template - void save_pointer(_ItemType *value, const char *valname, UINT32 count, int index = 0) { save_pointer(NULL, "global", NULL, index, value, valname, count); } + void save_pointer(_ItemType *value, const char *valname, UINT32 count, int index = 0) { save_pointer(nullptr, "global", nullptr, index, value, valname, count); } // file processing static save_error check_file(running_machine &machine, emu_file &file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...)); diff --git a/src/emu/screen.h b/src/emu/screen.h index 45caece012e..31487c7d4ea 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -457,7 +457,7 @@ typedef device_type_iterator<&device_creator, screen_device> scre template inline screen_update_ind16_delegate screen_update_delegate_smart(UINT32 (_FunctionClass::*callback)(screen_device &, bitmap_ind16 &, const rectangle &), const char *name, const char *devname) { - return screen_update_ind16_delegate(callback, name, devname, (_FunctionClass *)0); + return screen_update_ind16_delegate(callback, name, devname, (_FunctionClass *)nullptr); } template diff --git a/src/emu/sound/filter.cpp b/src/emu/sound/filter.cpp index 452dd8b3f1b..9473a8b720d 100644 --- a/src/emu/sound/filter.cpp +++ b/src/emu/sound/filter.cpp @@ -4,7 +4,7 @@ #include "filter.h" static filter* filter_alloc(void) { - auto f = global_alloc(filter); + auto f = global_alloc(filter); return f; } @@ -22,7 +22,7 @@ void filter_state_reset(filter* f, filter_state* s) { filter_state* filter_state_alloc(void) { int i; - auto s = global_alloc(filter_state); + auto s = global_alloc(filter_state); s->prev_mac = 0; for(i=0;ixprev[i] = 0; diff --git a/src/emu/sprite.h b/src/emu/sprite.h index eb8aaec71db..f10537f9900 100644 --- a/src/emu/sprite.h +++ b/src/emu/sprite.h @@ -89,7 +89,7 @@ protected: : device_t(mconfig, type, name, tag, owner, 0, shortname, file), m_xorigin(0), m_yorigin(0), - m_spriteram(NULL), + m_spriteram(nullptr), m_spriteram_bytes(0), m_dirty(dirty_granularity) { diff --git a/src/lib/formats/a26_cas.cpp b/src/lib/formats/a26_cas.cpp index 557a128a7af..d13b5270b45 100644 --- a/src/lib/formats/a26_cas.cpp +++ b/src/lib/formats/a26_cas.cpp @@ -129,7 +129,7 @@ static int a26_cas_fill_wave( INT16 *buffer, int length, UINT8 *bytes ) { } static int a26_cas_to_wav_size( const UINT8 *casdata, int caslen ) { - return a26_cas_do_work( NULL, casdata ); + return a26_cas_do_work( nullptr, casdata ); } static const struct CassetteLegacyWaveFiller a26_legacy_fill_wave = { @@ -160,7 +160,7 @@ static const struct CassetteFormat a26_cassette_format = { "a26", a26_cassette_identify, a26_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(a26_cassette_formats) diff --git a/src/lib/formats/ace_tap.cpp b/src/lib/formats/ace_tap.cpp index 3479d6ba1f5..10265ad5460 100644 --- a/src/lib/formats/ace_tap.cpp +++ b/src/lib/formats/ace_tap.cpp @@ -151,7 +151,7 @@ static int ace_tap_to_wav_size(const UINT8 *casdata, int caslen) { cas_size = caslen; - return ace_handle_tap( NULL, casdata ); + return ace_handle_tap( nullptr, casdata ); } @@ -184,7 +184,7 @@ static const struct CassetteFormat ace_tap_format = "tap", ace_tap_identify, ace_tap_load, - NULL + nullptr }; diff --git a/src/lib/formats/adam_cas.cpp b/src/lib/formats/adam_cas.cpp index 54d7427242d..0e38b97c1a0 100644 --- a/src/lib/formats/adam_cas.cpp +++ b/src/lib/formats/adam_cas.cpp @@ -204,7 +204,7 @@ static casserr_t coladam_ddp_load( cassette_image *cass ) static const struct CassetteFormat coladam_ddp = -{ "ddp", coladam_ddp_identify, coladam_ddp_load, NULL /* no save */ }; +{ "ddp", coladam_ddp_identify, coladam_ddp_load, nullptr /* no save */ }; CASSETTE_FORMATLIST_START(coleco_adam_cassette_formats) CASSETTE_FORMAT(coladam_ddp) diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp index 05a1927015a..cfc9b5350ef 100644 --- a/src/lib/formats/ap2_dsk.cpp +++ b/src/lib/formats/ap2_dsk.cpp @@ -232,7 +232,7 @@ static floperr_t apple2_dsk_write_track(floppy_image_legacy *floppy, int head, i nibble = (UINT8 *)buffer; nibble += sector * APPLE2_SMALL_NIBBLE_SIZE; - disk_decode_nib(sector_buffer, nibble, NULL, NULL, NULL); + disk_decode_nib(sector_buffer, nibble, nullptr, nullptr, nullptr); floppy_write_sector(floppy, head, track, sector, 0, sector_buffer, sizeof(sector_buffer), 0); } @@ -376,14 +376,14 @@ static floperr_t apple2_nib_read_sector(floppy_image_legacy *floppy, int head, i if (buflen != APPLE2_SECTOR_SIZE) return FLOPPY_ERROR_INTERNAL; - err = floppy_load_track(floppy, head, track, FALSE, &track_data_v, NULL); + err = floppy_load_track(floppy, head, track, FALSE, &track_data_v, nullptr); if (err) return err; track_data = (UINT8 *) track_data_v; nibble = track_data + (sector * APPLE2_NIBBLE_SIZE); - if (disk_decode_nib((UINT8 *)buffer, nibble, NULL, NULL, NULL)) + if (disk_decode_nib((UINT8 *)buffer, nibble, nullptr, nullptr, nullptr)) return FLOPPY_ERROR_INVALIDIMAGE; return FLOPPY_ERROR_SUCCESS; @@ -465,7 +465,7 @@ static floperr_t apple2_nib_write_sector(floppy_image_legacy *floppy, int head, if (buflen != APPLE2_SECTOR_SIZE) return FLOPPY_ERROR_INTERNAL; - err = floppy_load_track(floppy, head, track, TRUE, &track_data_v, NULL); + err = floppy_load_track(floppy, head, track, TRUE, &track_data_v, nullptr); if (err) return err; track_data = (UINT8 *) track_data_v; @@ -494,19 +494,19 @@ static UINT32 apple2_get_track_size(floppy_image_legacy *floppy, int head, int t /* ----------------------------------------------------------------------- */ LEGACY_FLOPPY_OPTIONS_START( apple2 ) - LEGACY_FLOPPY_OPTION( apple2_do, "do,dsk,bin", "Apple ][ DOS order disk image", apple2_dsk_identify, apple2_do_construct, NULL, + LEGACY_FLOPPY_OPTION( apple2_do, "do,dsk,bin", "Apple ][ DOS order disk image", apple2_dsk_identify, apple2_do_construct, nullptr, HEADS([1]) TRACKS([35]) SECTORS([16]) SECTOR_LENGTH([256]) FIRST_SECTOR_ID([0])) - LEGACY_FLOPPY_OPTION( apple2_po, "po,dsk,bin", "Apple ][ ProDOS order disk image", apple2_dsk_identify, apple2_po_construct, NULL, + LEGACY_FLOPPY_OPTION( apple2_po, "po,dsk,bin", "Apple ][ ProDOS order disk image", apple2_dsk_identify, apple2_po_construct, nullptr, HEADS([1]) TRACKS([35]) SECTORS([16]) SECTOR_LENGTH([256]) FIRST_SECTOR_ID([0])) - LEGACY_FLOPPY_OPTION( apple2_nib, "dsk,nib", "Apple ][ Nibble order disk image", apple2_nib_identify, apple2_nib_construct, NULL, + LEGACY_FLOPPY_OPTION( apple2_nib, "dsk,nib", "Apple ][ Nibble order disk image", apple2_nib_identify, apple2_nib_construct, nullptr, HEADS([1]) TRACKS([35]) SECTORS([16]) diff --git a/src/lib/formats/ap_dsk35.cpp b/src/lib/formats/ap_dsk35.cpp index 9efd835120d..385ff326047 100644 --- a/src/lib/formats/ap_dsk35.cpp +++ b/src/lib/formats/ap_dsk35.cpp @@ -488,7 +488,7 @@ static UINT32 apple35_get_offset(floppy_image_legacy *floppy, int head, int trac static floperr_t apple35_read_sector(floppy_image_legacy *floppy, int head, int track, int sector, void *buffer, size_t buflen) { UINT32 data_offset; - data_offset = apple35_get_offset(floppy, head, track, sector, NULL); + data_offset = apple35_get_offset(floppy, head, track, sector, nullptr); if (data_offset == ~0) { return FLOPPY_ERROR_SEEKERROR; @@ -503,7 +503,7 @@ static floperr_t apple35_write_sector(floppy_image_legacy *floppy, int head, int { UINT32 data_offset; - data_offset = apple35_get_offset(floppy, head, track, sector, NULL); + data_offset = apple35_get_offset(floppy, head, track, sector, nullptr); if (data_offset == ~0) return FLOPPY_ERROR_SEEKERROR; floppy_image_write(floppy, buffer, data_offset, buflen); @@ -976,7 +976,7 @@ static floperr_t apple35_diskcopy_headerdecode(floppy_image_legacy *floppy, UINT static FLOPPY_IDENTIFY(apple35_diskcopy_identify) { - *vote = apple35_diskcopy_headerdecode(floppy, NULL, NULL, NULL, NULL, NULL, NULL) ? 0 : 100; + *vote = apple35_diskcopy_headerdecode(floppy, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr) ? 0 : 100; return FLOPPY_ERROR_SUCCESS; } @@ -1121,7 +1121,7 @@ static floperr_t apple35_2img_decode(floppy_image_legacy *floppy, UINT32 *image_ static FLOPPY_IDENTIFY(apple35_2img_identify) { - *vote = apple35_2img_decode(floppy, NULL, NULL, NULL) ? 0 : 100; + *vote = apple35_2img_decode(floppy, nullptr, nullptr, nullptr) ? 0 : 100; return FLOPPY_ERROR_SUCCESS; } @@ -1175,12 +1175,12 @@ static FLOPPY_CONSTRUCT(apple35_2img_construct) LEGACY_FLOPPY_OPTIONS_START( apple35_mac ) - LEGACY_FLOPPY_OPTION( apple35_raw, "dsk,img,image", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, NULL, + LEGACY_FLOPPY_OPTION( apple35_raw, "dsk,img,image", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, nullptr, HEADS([1]-2) TRACKS([80]) SECTOR_LENGTH([512]) FIRST_SECTOR_ID([0])) - LEGACY_FLOPPY_OPTION( apple35_dc, "dc,dc42,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, NULL, + LEGACY_FLOPPY_OPTION( apple35_dc, "dc,dc42,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, nullptr, HEADS([1]-2) TRACKS([80]) SECTOR_LENGTH([512]) @@ -1188,17 +1188,17 @@ LEGACY_FLOPPY_OPTIONS_START( apple35_mac ) LEGACY_FLOPPY_OPTIONS_END LEGACY_FLOPPY_OPTIONS_START( apple35_iigs ) - LEGACY_FLOPPY_OPTION( apple35_raw, "dsk,img,image,po", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, NULL, + LEGACY_FLOPPY_OPTION( apple35_raw, "dsk,img,image,po", "Apple raw 3.5\" disk image", apple35_raw_identify, apple35_raw_construct, nullptr, HEADS([1]-2) TRACKS([80]) SECTOR_LENGTH([512]) FIRST_SECTOR_ID([0])) - LEGACY_FLOPPY_OPTION( apple35_dc, "dc,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, NULL, + LEGACY_FLOPPY_OPTION( apple35_dc, "dc,dsk,img,image", "Apple DiskCopy disk image", apple35_diskcopy_identify, apple35_diskcopy_construct, nullptr, HEADS([1]-2) TRACKS([80]) SECTOR_LENGTH([512]) FIRST_SECTOR_ID([0])) - LEGACY_FLOPPY_OPTION( apple35_2img, "2img,2mg", "Apple ][gs 2IMG disk image", apple35_2img_identify, apple35_2img_construct, NULL, + LEGACY_FLOPPY_OPTION( apple35_2img, "2img,2mg", "Apple ][gs 2IMG disk image", apple35_2img_identify, apple35_2img_construct, nullptr, HEADS([1]-2) TRACKS([80]) SECTOR_LENGTH([512]) diff --git a/src/lib/formats/apf_apt.cpp b/src/lib/formats/apf_apt.cpp index b609a109ef6..f1a333f2c77 100644 --- a/src/lib/formats/apf_apt.cpp +++ b/src/lib/formats/apf_apt.cpp @@ -172,14 +172,14 @@ static int apf_apt_calculate_size_in_samples(const UINT8 *bytes, int length) { apf_image_size = length; - return apf_apt_handle_cassette(NULL, bytes); + return apf_apt_handle_cassette(nullptr, bytes); } static int apf_cpf_calculate_size_in_samples(const UINT8 *bytes, int length) { apf_image_size = length; - return apf_cpf_handle_cassette(NULL, bytes); + return apf_cpf_handle_cassette(nullptr, bytes); } //********************************************************************************* @@ -210,7 +210,7 @@ static const struct CassetteFormat apf_cpf_format = "cas,cpf", apf_cpf_identify, apf_cpf_load, - NULL + nullptr }; //********************************************************************************* @@ -241,7 +241,7 @@ static const struct CassetteFormat apf_apt_format = "apt", apf_apt_identify, apf_apt_load, - NULL + nullptr }; //********************************************************************************* diff --git a/src/lib/formats/atari_dsk.cpp b/src/lib/formats/atari_dsk.cpp index f5ccd03c952..d73cbf8185f 100644 --- a/src/lib/formats/atari_dsk.cpp +++ b/src/lib/formats/atari_dsk.cpp @@ -31,7 +31,7 @@ LEGACY_FLOPPY_OPTIONS_START( atari_only ) "Atari floppy disk image", atari_dsk_identify, atari_dsk_construct, - NULL, - NULL + nullptr, + nullptr ) LEGACY_FLOPPY_OPTIONS_END0 diff --git a/src/lib/formats/atom_tap.cpp b/src/lib/formats/atom_tap.cpp index 06d614a10b3..917500eace1 100644 --- a/src/lib/formats/atom_tap.cpp +++ b/src/lib/formats/atom_tap.cpp @@ -138,7 +138,7 @@ const struct CassetteFormat atom_tap_format = "tap", atom_tap_identify, atom_tap_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START( atom_cassette_formats ) 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; diff --git a/src/lib/formats/camplynx_cas.cpp b/src/lib/formats/camplynx_cas.cpp index a525f18d3cb..15ed26c8201 100644 --- a/src/lib/formats/camplynx_cas.cpp +++ b/src/lib/formats/camplynx_cas.cpp @@ -150,7 +150,7 @@ static int camplynx_cassette_calculate_size_in_samples(const UINT8 *bytes, int l { camplynx_image_size = length; - return camplynx_handle_cassette(NULL, bytes); + return camplynx_handle_cassette(nullptr, bytes); } static const struct CassetteLegacyWaveFiller lynx48k_legacy_fill_wave = @@ -200,7 +200,7 @@ static const struct CassetteFormat lynx48k_cassette_image_format = "tap", lynx48k_cassette_identify, lynx48k_cassette_load, - NULL + nullptr }; static const struct CassetteFormat lynx128k_cassette_image_format = @@ -208,7 +208,7 @@ static const struct CassetteFormat lynx128k_cassette_image_format = "tap", lynx128k_cassette_identify, lynx128k_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(lynx48k_cassette_formats) diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp index 3154def299a..aabc13ee393 100644 --- a/src/lib/formats/cassimg.cpp +++ b/src/lib/formats/cassimg.cpp @@ -100,7 +100,7 @@ static void cassette_finishinit(casserr_t err, cassette_image *cassette, cassett if (cassette && (err || !outcassette)) { cassette_close(cassette); - cassette = NULL; + cassette = nullptr; } if (outcassette) *outcassette = cassette; @@ -133,7 +133,7 @@ casserr_t cassette_open_choices(void *file, const struct io_procs *procs, const formats = cassette_default_formats; /* create the cassette object */ - cassette = cassette_init(NULL, file, procs, flags); + cassette = cassette_init(nullptr, file, procs, flags); if (!cassette) { err = CASSETTE_ERROR_OUTOFMEMORY; @@ -141,7 +141,7 @@ casserr_t cassette_open_choices(void *file, const struct io_procs *procs, const } /* identify the image */ - format = NULL; + format = nullptr; for (i = 0; !format && formats[i]; i++) { if (good_format(formats[i], extension, flags)) @@ -150,7 +150,7 @@ casserr_t cassette_open_choices(void *file, const struct io_procs *procs, const memset(&opts, 0, sizeof(opts)); err = format->identify(cassette, &opts); if (err == CASSETTE_ERROR_INVALIDIMAGE) - format = NULL; + format = nullptr; else if (err) goto done; } @@ -189,8 +189,8 @@ casserr_t cassette_open(void *file, const struct io_procs *procs, { const struct CassetteFormat *formats[2]; formats[0] = format; - formats[1] = NULL; - return cassette_open_choices(file, procs, NULL, formats, flags, outcassette); + formats[1] = nullptr; + return cassette_open_choices(file, procs, nullptr, formats, flags, outcassette); } @@ -207,7 +207,7 @@ casserr_t cassette_create(void *file, const struct io_procs *procs, const struct return CASSETTE_ERROR_INVALIDIMAGE; /* is this a good format? */ - if (!good_format(format, NULL, flags)) + if (!good_format(format, nullptr, flags)) return CASSETTE_ERROR_INVALIDIMAGE; /* normalize arguments */ @@ -374,7 +374,7 @@ static casserr_t compute_manipulation_ranges(cassette_image *cassette, int chann static casserr_t lookup_sample(cassette_image *cassette, int channel, size_t sample, INT32 **ptr) { - *ptr = NULL; + *ptr = nullptr; size_t sample_blocknum = (sample / SAMPLES_PER_BLOCK) * cassette->channels + channel; size_t sample_index = sample % SAMPLES_PER_BLOCK; @@ -385,7 +385,7 @@ static casserr_t lookup_sample(cassette_image *cassette, int channel, size_t sam memset(&cassette->blocks[osize], 0, (cassette->blocks.size()-osize)*sizeof(cassette->blocks[0])); } - if (cassette->blocks[sample_blocknum] == NULL) + if (cassette->blocks[sample_blocknum] == nullptr) cassette->blocks[sample_blocknum] = global_alloc(sample_block); sample_block &block = *cassette->blocks[sample_blocknum]; @@ -763,7 +763,7 @@ casserr_t cassette_read_modulated_data(cassette_image *cassette, int channel, do casserr_t err; UINT8 buffer_stack[1024]; UINT8 *buffer; - UINT8 *alloc_buffer = NULL; + UINT8 *alloc_buffer = nullptr; double delta; double total_displacement = 0.0; size_t this_length; diff --git a/src/lib/formats/cbm_tap.cpp b/src/lib/formats/cbm_tap.cpp index 23b8a8846ed..5c3033f9dad 100644 --- a/src/lib/formats/cbm_tap.cpp +++ b/src/lib/formats/cbm_tap.cpp @@ -157,7 +157,7 @@ static void toggle_wave_data(void ) static void cbm_output_wave( INT16 **buffer, int length ) { - if (buffer == NULL) + if (buffer == nullptr) return; for( ; length > 0; length-- ) @@ -187,7 +187,7 @@ static int cbm_tap_do_work( INT16 **buffer, int length, const UINT8 *data ) /* int waveamp_high, waveamp_low; */ /* Log .TAP info but only once */ - if (!(buffer == NULL)) + if (!(buffer == nullptr)) { LOG_FORMATS("TAP version : %d\n", version); LOG_FORMATS("Machine type : %d\n", system); @@ -204,7 +204,7 @@ static int cbm_tap_do_work( INT16 **buffer, int length, const UINT8 *data ) } /* is the .tap file corrupted? */ - if ((data == NULL) || (length <= CBM_HEADER_SIZE)) + if ((data == nullptr) || (length <= CBM_HEADER_SIZE)) return -1; @@ -321,7 +321,7 @@ static int cbm_tap_do_work( INT16 **buffer, int length, const UINT8 *data ) static int cbm_tap_to_wav_size( const UINT8 *tapdata, int taplen ) { - int size = cbm_tap_do_work(NULL, taplen, tapdata); + int size = cbm_tap_do_work(nullptr, taplen, tapdata); len = taplen; return size; @@ -364,7 +364,7 @@ static const struct CassetteFormat cbm_tap_cassette_format = { "tap", cbm_cassette_identify, cbm_cassette_load, - NULL + nullptr }; diff --git a/src/lib/formats/ccvf_dsk.cpp b/src/lib/formats/ccvf_dsk.cpp index 09119a4b632..8e30dcfff33 100644 --- a/src/lib/formats/ccvf_dsk.cpp +++ b/src/lib/formats/ccvf_dsk.cpp @@ -109,7 +109,7 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) if (byteoffs==78720) break; hex[0]=line[byte * 2]; hex[1]=line[(byte * 2) + 1]; - bytes[byteoffs++] = strtol(hex, NULL, 16); + bytes[byteoffs++] = strtol(hex, nullptr, 16); } } start = end + 1; diff --git a/src/lib/formats/cgen_cas.cpp b/src/lib/formats/cgen_cas.cpp index d9165441618..5cd4c3e1b0e 100644 --- a/src/lib/formats/cgen_cas.cpp +++ b/src/lib/formats/cgen_cas.cpp @@ -111,7 +111,7 @@ static int cgenie_cas_to_wav_size(const UINT8 *casdata, int caslen) { cas_size = caslen; - return cgenie_handle_cas( NULL, casdata ); + return cgenie_handle_cas( nullptr, casdata ); } static const struct CassetteLegacyWaveFiller cgenie_cas_legacy_fill_wave = @@ -143,7 +143,7 @@ static const struct CassetteFormat cgenie_cas_format = "cas", cgenie_cas_identify, cgenie_cas_load, - NULL + nullptr }; diff --git a/src/lib/formats/coco_cas.cpp b/src/lib/formats/coco_cas.cpp index e70b28d69c0..d9599aa8c5a 100644 --- a/src/lib/formats/coco_cas.cpp +++ b/src/lib/formats/coco_cas.cpp @@ -277,7 +277,7 @@ const struct CassetteFormat coco_cas_format = "cas", coco_cas_identify, coco_cas_load, - NULL + nullptr }; const struct CassetteFormat alice32_cas_format = @@ -285,7 +285,7 @@ const struct CassetteFormat alice32_cas_format = "cas,c10,k7", coco_cas_identify, alice32_cas_load, - NULL + nullptr }; diff --git a/src/lib/formats/cqm_dsk.cpp b/src/lib/formats/cqm_dsk.cpp index 5ecf4da3186..ff191aec56c 100644 --- a/src/lib/formats/cqm_dsk.cpp +++ b/src/lib/formats/cqm_dsk.cpp @@ -128,7 +128,7 @@ static floperr_t cqm_read_indexed_sector(floppy_image_legacy *floppy, int head, static floperr_t cqm_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length) { 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; diff --git a/src/lib/formats/csw_cas.cpp b/src/lib/formats/csw_cas.cpp index 94a45edde1f..336a9dde7cd 100644 --- a/src/lib/formats/csw_cas.cpp +++ b/src/lib/formats/csw_cas.cpp @@ -110,9 +110,9 @@ static int csw_cas_to_wav_size( const UINT8 *casdata, int caslen ) d_stream.avail_out = 1; d_stream.total_out=0; - d_stream.zalloc = 0; - d_stream.zfree = 0; - d_stream.opaque = 0; + d_stream.zalloc = nullptr; + d_stream.zfree = nullptr; + d_stream.opaque = nullptr; d_stream.data_type=0; err = inflateInit( &d_stream ); @@ -218,9 +218,9 @@ static int csw_cas_fill_wave( INT16 *buffer, int length, UINT8 *bytes ) d_stream.avail_out = 1; d_stream.total_out=0; - d_stream.zalloc = 0; - d_stream.zfree = 0; - d_stream.opaque = 0; + d_stream.zalloc = nullptr; + d_stream.zfree = nullptr; + d_stream.opaque = nullptr; d_stream.data_type=0; err = inflateInit( &d_stream ); @@ -300,7 +300,7 @@ static const struct CassetteFormat csw_cassette_format = { "csw", csw_cassette_identify, csw_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(csw_cassette_formats) diff --git a/src/lib/formats/d88_dsk.cpp b/src/lib/formats/d88_dsk.cpp index f8383191e6d..b676db7fd21 100644 --- a/src/lib/formats/d88_dsk.cpp +++ b/src/lib/formats/d88_dsk.cpp @@ -319,7 +319,7 @@ FLOPPY_IDENTIFY(d88_dsk_identify) { UINT32 size; - d88_get_header(floppy,&size,NULL,NULL,NULL); + d88_get_header(floppy,&size,nullptr,nullptr,nullptr); if(floppy_image_size(floppy) == size) { @@ -517,7 +517,7 @@ bool d88_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) sdatapos += size; } else - sects[i].data = NULL; + sects[i].data = nullptr; } build_pc_track_mfm(track, head, image, cell_count, sector_count, sects, calc_default_pc_gap3_size(form_factor, sects[0].actual_size)); diff --git a/src/lib/formats/dsk_dsk.cpp b/src/lib/formats/dsk_dsk.cpp index 6922071de25..4987a5bb52b 100644 --- a/src/lib/formats/dsk_dsk.cpp +++ b/src/lib/formats/dsk_dsk.cpp @@ -162,7 +162,7 @@ static floperr_t dsk_write_indexed_sector(floppy_image_legacy *floppy, int head, static floperr_t dsk_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length) { 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; @@ -179,7 +179,7 @@ static floperr_t dsk_get_indexed_sector_info(floppy_image_legacy *floppy, int he UINT8 sector_info[0x100]; int pos; - retVal = get_offset(floppy, head, track, sector_index, FALSE, NULL); + retVal = get_offset(floppy, head, track, sector_index, FALSE, nullptr); offset = dsk_get_track_offset(floppy,head,track); pos = 0x18 + (sector_index << 3); floppy_image_read(floppy, sector_info, offset, 0x100); @@ -419,7 +419,7 @@ bool dsk_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) sdatapos += sects[j].actual_size; } else - sects[j].data = NULL; + sects[j].data = nullptr; if(extendformat) pos += sector.data_length; diff --git a/src/lib/formats/fc100_cas.cpp b/src/lib/formats/fc100_cas.cpp index 415d3fb01db..01986e789bf 100644 --- a/src/lib/formats/fc100_cas.cpp +++ b/src/lib/formats/fc100_cas.cpp @@ -119,7 +119,7 @@ static int fc100_cassette_calculate_size_in_samples(const UINT8 *bytes, int leng { fc100_image_size = length; - return fc100_handle_cassette(NULL, bytes); + return fc100_handle_cassette(nullptr, bytes); } static const struct CassetteLegacyWaveFiller fc100_legacy_fill_wave = @@ -148,7 +148,7 @@ static const struct CassetteFormat fc100_cassette_image_format = "cas", fc100_cassette_identify, fc100_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(fc100_cassette_formats) diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp index e66df68cdbc..fa10ab3e4a9 100644 --- a/src/lib/formats/flopimg.cpp +++ b/src/lib/formats/flopimg.cpp @@ -81,11 +81,11 @@ static floppy_image_legacy *floppy_init(void *fp, const struct io_procs *procs, floppy = (floppy_image_legacy *)malloc(sizeof(floppy_image_legacy)); if (!floppy) - return NULL; + return nullptr; memset(floppy, 0, sizeof(*floppy)); - floppy->tags = pool_alloc_lib(NULL); - floppy->tag_data = NULL; + floppy->tags = pool_alloc_lib(nullptr); + floppy->tag_data = nullptr; floppy->io.file = fp; floppy->io.procs = procs; floppy->io.filler = 0xFF; @@ -151,7 +151,7 @@ static floperr_t floppy_open_internal(void *fp, const struct io_procs *procs, co if (outfloppy) { /* call the format constructor */ - err = floppy_options[best_option].construct(floppy, &floppy_options[best_option], NULL); + err = floppy_options[best_option].construct(floppy, &floppy_options[best_option], nullptr); if (err) goto done; @@ -168,7 +168,7 @@ done: if (floppy && (!outfloppy || err)) { floppy_close_internal(floppy, FALSE); - floppy = NULL; + floppy = nullptr; } if (outoption) @@ -183,7 +183,7 @@ done: floperr_t floppy_identify(void *fp, const struct io_procs *procs, const char *extension, const struct FloppyFormat *formats, int *identified_format) { - return floppy_open_internal(fp, procs, extension, formats, INT_MAX, FLOPPY_FLAGS_READONLY, NULL, identified_format); + return floppy_open_internal(fp, procs, extension, formats, INT_MAX, FLOPPY_FLAGS_READONLY, nullptr, identified_format); } @@ -191,7 +191,7 @@ floperr_t floppy_identify(void *fp, const struct io_procs *procs, const char *ex floperr_t floppy_open(void *fp, const struct io_procs *procs, const char *extension, const struct FloppyFormat *format, int flags, floppy_image_legacy **outfloppy) { - return floppy_open_internal(fp, procs, extension, format, 1, flags, outfloppy, NULL); + return floppy_open_internal(fp, procs, extension, format, 1, flags, outfloppy, nullptr); } @@ -199,7 +199,7 @@ floperr_t floppy_open(void *fp, const struct io_procs *procs, const char *extens floperr_t floppy_open_choices(void *fp, const struct io_procs *procs, const char *extension, const struct FloppyFormat *formats, int flags, floppy_image_legacy **outfloppy) { - return floppy_open_internal(fp, procs, extension, formats, INT_MAX, flags, outfloppy, NULL); + return floppy_open_internal(fp, procs, extension, formats, INT_MAX, flags, outfloppy, nullptr); } @@ -231,11 +231,11 @@ static floperr_t option_to_floppy_error(optreserr_t oerr) floperr_t floppy_create(void *fp, const struct io_procs *procs, const struct FloppyFormat *format, option_resolution *parameters, floppy_image_legacy **outfloppy) { - floppy_image_legacy *floppy = NULL; + floppy_image_legacy *floppy = nullptr; optreserr_t oerr; floperr_t err; int heads, tracks, h, t; - option_resolution *alloc_resolution = NULL; + option_resolution *alloc_resolution = nullptr; assert(format); @@ -307,7 +307,7 @@ done: if (err && floppy) { floppy_close_internal(floppy, FALSE); - floppy = NULL; + floppy = nullptr; } if (outfloppy) @@ -474,7 +474,7 @@ static floperr_t floppy_readwrite_sector(floppy_image_legacy *floppy, int head, { /* find out the size of this sector */ if (indexed) - err = fmt->get_indexed_sector_info(floppy, head, track, sector, NULL, NULL, NULL, §or_length, NULL); + err = fmt->get_indexed_sector_info(floppy, head, track, sector, nullptr, nullptr, nullptr, §or_length, nullptr); else err = fmt->get_sector_length(floppy, head, track, sector, §or_length); if (err) @@ -683,7 +683,7 @@ floperr_t floppy_format_track(floppy_image_legacy *floppy, int head, int track, { floperr_t err; struct FloppyCallbacks *format; - option_resolution *alloc_resolution = NULL; + option_resolution *alloc_resolution = nullptr; optreserr_t oerr; /* supported? */ @@ -785,7 +785,7 @@ floperr_t floppy_get_sector_count(floppy_image_legacy *floppy, int head, int tra do { - err = floppy_get_indexed_sector_info(floppy, head, track, sector_index, NULL, NULL, NULL, NULL, NULL); + err = floppy_get_indexed_sector_info(floppy, head, track, sector_index, nullptr, nullptr, nullptr, nullptr, nullptr); if (!err) sector_index++; } @@ -867,7 +867,7 @@ floperr_t floppy_load_track(floppy_image_legacy *floppy, int head, int track, in error: if (track_data) - *track_data = NULL; + *track_data = nullptr; if (track_length) *track_length = 0; return err; @@ -923,7 +923,7 @@ const char *floppy_error(floperr_t err) }; if ((err < 0) || (err >= ARRAY_LENGTH(error_messages))) - return NULL; + return nullptr; return error_messages[err]; } @@ -1017,7 +1017,7 @@ const char *floppy_image::get_variant_name(UINT32 form_factor, UINT32 variant) floppy_image_format_t::floppy_image_format_t() { - next = 0; + next = nullptr; } floppy_image_format_t::~floppy_image_format_t() @@ -2184,7 +2184,7 @@ const floppy_image_format_t::desc_e *floppy_image_format_t::atari_st_fcp_get_des case 11: return atari_st_fcp_11; } - return 0; + return nullptr; } // Amiga layouts diff --git a/src/lib/formats/fm7_cas.cpp b/src/lib/formats/fm7_cas.cpp index b1ce8f397b4..52892fdea2e 100644 --- a/src/lib/formats/fm7_cas.cpp +++ b/src/lib/formats/fm7_cas.cpp @@ -65,7 +65,7 @@ static int fm7_cas_to_wav_size (const UINT8 *casdata, int caslen) { cas_size = caslen; - return fm7_handle_t77(NULL,casdata); + return fm7_handle_t77(nullptr,casdata); } /******************************************************************* @@ -104,7 +104,7 @@ static const struct CassetteFormat fm7_cassette_format = { "t77", fm7_cas_identify, fm7_cas_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(fm7_cassette_formats) diff --git a/src/lib/formats/fmsx_cas.cpp b/src/lib/formats/fmsx_cas.cpp index 10a26d2e232..c135880dc79 100644 --- a/src/lib/formats/fmsx_cas.cpp +++ b/src/lib/formats/fmsx_cas.cpp @@ -136,7 +136,7 @@ static const struct CassetteFormat fmsx_cas_format = "tap,cas", fmsx_cas_identify, fmsx_cas_load, - NULL + nullptr }; diff --git a/src/lib/formats/gtp_cas.cpp b/src/lib/formats/gtp_cas.cpp index 1711a0a76b5..4cdb546ea6b 100644 --- a/src/lib/formats/gtp_cas.cpp +++ b/src/lib/formats/gtp_cas.cpp @@ -33,7 +33,7 @@ static INT16 len; static void gtp_output_wave( INT16 **buffer, int length ) { - if ( buffer == NULL ) { + if ( buffer == nullptr ) { return; } @@ -111,7 +111,7 @@ static int gtp_cas_to_wav_size( const UINT8 *casdata, int caslen ) { int size,n; size = 0; n = 0; - if (casdata == NULL) return -1; + if (casdata == nullptr) return -1; while(n 8) { - sects[i].data = NULL; + sects[i].data = nullptr; } else { sects[i].deleted = stype == 3 || stype == 4 || stype == 7 || stype == 8; diff --git a/src/lib/formats/ioprocs.cpp b/src/lib/formats/ioprocs.cpp index 2d75bff8b9f..24f92060a82 100644 --- a/src/lib/formats/ioprocs.cpp +++ b/src/lib/formats/ioprocs.cpp @@ -55,7 +55,7 @@ const struct io_procs stdio_ioprocs = const struct io_procs stdio_ioprocs_noclose = { - NULL, + nullptr, stdio_seekproc, stdio_readproc, stdio_writeproc, @@ -109,7 +109,7 @@ const struct io_procs corefile_ioprocs = const struct io_procs corefile_ioprocs_noclose = { - NULL, + nullptr, corefile_seekproc, corefile_readproc, corefile_writeproc, diff --git a/src/lib/formats/ipf_dsk.cpp b/src/lib/formats/ipf_dsk.cpp index afb4c4ce9f3..ade50a8e2f9 100644 --- a/src/lib/formats/ipf_dsk.cpp +++ b/src/lib/formats/ipf_dsk.cpp @@ -88,7 +88,7 @@ bool ipf_format::parse(dynamic_buffer &data, floppy_image *image) if(res) res = generate_tracks(image); global_free_array(tinfos); - tinfos = NULL; + tinfos = nullptr; return res; } @@ -118,9 +118,9 @@ bool ipf_format::parse_info(const UINT8 *info) ipf_format::track_info *ipf_format::get_index(UINT32 idx) { if(idx > 1000) - return 0; + return nullptr; if(idx >= tcount) { - track_info *ti1 = global_alloc_array_clear(track_info, idx+1); + auto ti1 = global_alloc_array_clear(track_info, idx+1); memcpy(ti1, tinfos, tcount*sizeof(tinfos)); global_free_array(tinfos); tcount = idx+1; diff --git a/src/lib/formats/kc_cas.cpp b/src/lib/formats/kc_cas.cpp index 32d7901cad5..40e261aed7f 100644 --- a/src/lib/formats/kc_cas.cpp +++ b/src/lib/formats/kc_cas.cpp @@ -245,7 +245,7 @@ static int kc_kcc_to_wav_size(const UINT8 *casdata, int caslen) { kc_image_size = caslen ; - return kc_handle_kcc( NULL, casdata ); + return kc_handle_kcc( nullptr, casdata ); } @@ -277,7 +277,7 @@ static const struct CassetteFormat kc_kcc_format = "kcc,kcb", kc_kcc_identify, kc_kcc_load, - NULL + nullptr }; @@ -297,7 +297,7 @@ static int kc_tap_to_wav_size(const UINT8 *casdata, int caslen) { kc_image_size = caslen ; - return kc_handle_tap( NULL, casdata ); + return kc_handle_tap( nullptr, casdata ); } @@ -329,7 +329,7 @@ static const struct CassetteFormat kc_tap_format = "tap,853,854,855,tp2,kcm", kc_tap_identify, kc_tap_load, - NULL + nullptr }; @@ -349,7 +349,7 @@ static int kc_sss_to_wav_size(const UINT8 *casdata, int caslen) { kc_image_size = caslen ; - return kc_handle_sss( NULL, casdata ); + return kc_handle_sss( nullptr, casdata ); } @@ -380,7 +380,7 @@ static const struct CassetteFormat kc_sss_format = "sss", kc_sss_identify, kc_sss_load, - NULL + nullptr }; diff --git a/src/lib/formats/kim1_cas.cpp b/src/lib/formats/kim1_cas.cpp index b8527e10462..db4c4a95a0b 100644 --- a/src/lib/formats/kim1_cas.cpp +++ b/src/lib/formats/kim1_cas.cpp @@ -156,7 +156,7 @@ static int kim1_kim_to_wav_size(const UINT8 *casdata, int caslen) { cas_size = caslen; - return kim1_handle_kim( NULL, casdata ); + return kim1_handle_kim( nullptr, casdata ); } static const struct CassetteLegacyWaveFiller kim1_kim_legacy_fill_wave = @@ -188,7 +188,7 @@ static const struct CassetteFormat kim1_kim_format = "kim,kim1", kim1_kim_identify, kim1_kim_load, - NULL + nullptr }; diff --git a/src/lib/formats/lviv_lvt.cpp b/src/lib/formats/lviv_lvt.cpp index ecb1940eb6e..03172f6ac36 100644 --- a/src/lib/formats/lviv_lvt.cpp +++ b/src/lib/formats/lviv_lvt.cpp @@ -143,7 +143,7 @@ static const struct CassetteFormat lviv_lvt_image_format = "lvt,lvr,lv0,lv1,lv2,lv3", lviv_lvt_identify, lviv_lvt_load, - NULL + nullptr }; diff --git a/src/lib/formats/mbee_cas.cpp b/src/lib/formats/mbee_cas.cpp index fe0a2ffbc24..58a8f81232a 100644 --- a/src/lib/formats/mbee_cas.cpp +++ b/src/lib/formats/mbee_cas.cpp @@ -224,7 +224,7 @@ static int mbee_tap_calculate_size_in_samples(const UINT8 *bytes, int length) { mbee_image_size = length; - return mbee_handle_tap(NULL, bytes); + return mbee_handle_tap(nullptr, bytes); } static const struct CassetteLegacyWaveFiller mbee_tap_config = @@ -253,7 +253,7 @@ static const struct CassetteFormat mbee_tap_image_format = "tap", mbee_tap_identify, mbee_tap_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(mbee_cassette_formats) diff --git a/src/lib/formats/mfi_dsk.cpp b/src/lib/formats/mfi_dsk.cpp index 043d61b0d3d..b6d0f11e2c7 100644 --- a/src/lib/formats/mfi_dsk.cpp +++ b/src/lib/formats/mfi_dsk.cpp @@ -187,8 +187,8 @@ bool mfi_format::save(io_generic *io, floppy_image *image) int pos = sizeof(header) + (tracks << resolution)*heads*sizeof(entry); int epos = 0; - UINT32 *precomp = global_alloc_array(UINT32, max_track_size); - UINT8 *postcomp = global_alloc_array(UINT8, max_track_size*4 + 1000); + auto precomp = global_alloc_array(UINT32, max_track_size); + auto postcomp = global_alloc_array(UINT8, max_track_size*4 + 1000); for(int track=0; track <= (tracks-1) << 2; track += 4 >> resolution) for(int head=0; head> j) & 1; @@ -113,7 +113,7 @@ static const struct CassetteFormat orao_cassette_format = { "tap", orao_cassette_identify, orao_cassette_load, - NULL + nullptr }; diff --git a/src/lib/formats/oric_tap.cpp b/src/lib/formats/oric_tap.cpp index 9dbf378db9b..ed2a7841076 100644 --- a/src/lib/formats/oric_tap.cpp +++ b/src/lib/formats/oric_tap.cpp @@ -513,7 +513,7 @@ static const struct CassetteFormat oric_tap_format = "tap", oric_tap_identify, oric_tap_load, - NULL + nullptr }; diff --git a/src/lib/formats/p6001_cas.cpp b/src/lib/formats/p6001_cas.cpp index a0ce656e4eb..e91e4b40748 100644 --- a/src/lib/formats/p6001_cas.cpp +++ b/src/lib/formats/p6001_cas.cpp @@ -50,7 +50,7 @@ static int pc6001_cas_to_wav_size (const UINT8 *casdata, int caslen) { cas_size = caslen*8; - return pc6001_handle_cas(NULL,casdata); + return pc6001_handle_cas(nullptr,casdata); } /******************************************************************* @@ -89,7 +89,7 @@ static const struct CassetteFormat pc6001_cassette_format = { "cas", pc6001_cas_identify, pc6001_cas_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(pc6001_cassette_formats) diff --git a/src/lib/formats/pasti_dsk.cpp b/src/lib/formats/pasti_dsk.cpp index 6fa53b2590d..f6ed1556711 100644 --- a/src/lib/formats/pasti_dsk.cpp +++ b/src/lib/formats/pasti_dsk.cpp @@ -90,7 +90,7 @@ bool pasti_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) io_generic_read(io, &raw_track[0], pos+16, entry_len-16); - UINT8 *fuzz = fuzz_len ? &raw_track[16*sect] : 0; + UINT8 *fuzz = fuzz_len ? &raw_track[16*sect] : nullptr; UINT8 *bdata = fuzz ? fuzz+fuzz_len : &raw_track[16*sect]; UINT8 *tdata = bdata; @@ -105,7 +105,7 @@ bool pasti_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) tsize = tdata[0] | (tdata[1] << 8); tdata += 2; } else - tdata = 0; + tdata = nullptr; if(0) { printf("Track %2d.%d: el=%d fl=%d sect=%d flags=%04x tlen=%d/%d tnum=%d flags2=%02x sync=%x\n", @@ -133,7 +133,7 @@ bool pasti_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) int s_flags = sh[14] | (sh[15] << 8); obs.sectors[s].data = bdata + s_off; - obs.sectors[s].fuzzy_mask = 0; + obs.sectors[s].fuzzy_mask = nullptr; memcpy(obs.sectors[s].id, sh+8, 6); obs.sectors[s].time_ratio = s_time ? s_time / 16384.0 : 1; obs.sectors[s].position = s_pos/8-12; diff --git a/src/lib/formats/pc_dsk.cpp b/src/lib/formats/pc_dsk.cpp index 19e0f21e08e..0ab32aff7b3 100644 --- a/src/lib/formats/pc_dsk.cpp +++ b/src/lib/formats/pc_dsk.cpp @@ -134,7 +134,7 @@ static FLOPPY_CONSTRUCT(pc_dsk_construct) /* ----------------------------------------------------------------------- */ LEGACY_FLOPPY_OPTIONS_START( pc ) - LEGACY_FLOPPY_OPTION( pc_dsk, "dsk,ima,img,ufi,360", "PC floppy disk image", pc_dsk_identify, pc_dsk_construct, NULL, + LEGACY_FLOPPY_OPTION( pc_dsk, "dsk,ima,img,ufi,360", "PC floppy disk image", pc_dsk_identify, pc_dsk_construct, nullptr, HEADS([1]-2) TRACKS(40/[80]) SECTORS(8/[9]/10/15/18/36)) diff --git a/src/lib/formats/phc25_cas.cpp b/src/lib/formats/phc25_cas.cpp index 1253bd98a3a..73dfdb17ff3 100644 --- a/src/lib/formats/phc25_cas.cpp +++ b/src/lib/formats/phc25_cas.cpp @@ -144,7 +144,7 @@ static int phc25_cassette_calculate_size_in_samples(const UINT8 *bytes, int leng { phc25_image_size = length; - return phc25_handle_cassette(NULL, bytes); + return phc25_handle_cassette(nullptr, bytes); } static const struct CassetteLegacyWaveFiller phc25_legacy_fill_wave = @@ -173,7 +173,7 @@ static const struct CassetteFormat phc25_cassette_image_format = "phc", phc25_cassette_identify, phc25_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(phc25_cassette_formats) diff --git a/src/lib/formats/pmd_cas.cpp b/src/lib/formats/pmd_cas.cpp index ba5baee1a65..4643eaf9251 100644 --- a/src/lib/formats/pmd_cas.cpp +++ b/src/lib/formats/pmd_cas.cpp @@ -181,7 +181,7 @@ static int pmd85_cassette_calculate_size_in_samples(const UINT8 *bytes, int leng { pmd85_image_size = length; - return pmd85_handle_cassette(NULL, bytes); + return pmd85_handle_cassette(nullptr, bytes); } static const struct CassetteLegacyWaveFiller pmd85_legacy_fill_wave = @@ -210,7 +210,7 @@ static const struct CassetteFormat pmd85_cassette_image_format = "pmd,tap,ptp", pmd85_cassette_identify, pmd85_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(pmd85_cassette_formats) diff --git a/src/lib/formats/primoptp.cpp b/src/lib/formats/primoptp.cpp index 635f66d25ac..23aab613c29 100644 --- a/src/lib/formats/primoptp.cpp +++ b/src/lib/formats/primoptp.cpp @@ -241,7 +241,7 @@ static const struct CassetteFormat primo_ptp_image_format = "ptp", primo_ptp_identify, primo_ptp_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(primo_ptp_format) diff --git a/src/lib/formats/rk_cas.cpp b/src/lib/formats/rk_cas.cpp index 03139e1515d..968b8afdc23 100644 --- a/src/lib/formats/rk_cas.cpp +++ b/src/lib/formats/rk_cas.cpp @@ -217,63 +217,63 @@ static const struct CassetteFormat rku_cassette_format = { "rku", rk20_cassette_identify, rk20_cassette_load, - NULL + nullptr }; static const struct CassetteFormat rk8_cassette_format = { "rk8", rk60_cassette_identify, rk60_cassette_load, - NULL + nullptr }; static const struct CassetteFormat rks_cassette_format = { "rks", rk20_cassette_identify, rk20_cassette_load, - NULL + nullptr }; static const struct CassetteFormat rko_cassette_format = { "rko", rk20_cassette_identify, rk20_cassette_load, - NULL + nullptr }; static const struct CassetteFormat rkr_cassette_format = { "rk,rkr", rk20_cassette_identify, rk20_cassette_load, - NULL + nullptr }; static const struct CassetteFormat rka_cassette_format = { "rka", rk20_cassette_identify, rk20_cassette_load, - NULL + nullptr }; static const struct CassetteFormat rkm_cassette_format = { "rkm", rk22_cassette_identify, rk22_cassette_load, - NULL + nullptr }; static const struct CassetteFormat rkp_cassette_format = { "rkp", rk20_cassette_identify, rk20_cassette_load, - NULL + nullptr }; static const struct CassetteFormat gam_cassette_format = { "gam,g16,pki", gam_cassette_identify, gam_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(rku_cassette_formats) diff --git a/src/lib/formats/sc3000_bit.cpp b/src/lib/formats/sc3000_bit.cpp index 2b5fd635db5..f15488bda68 100644 --- a/src/lib/formats/sc3000_bit.cpp +++ b/src/lib/formats/sc3000_bit.cpp @@ -98,7 +98,7 @@ const struct CassetteFormat sc3000_bit_format = "bit", sc3000_bit_identify, sc3000_bit_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START( sc3000_cassette_formats ) diff --git a/src/lib/formats/sol_cas.cpp b/src/lib/formats/sol_cas.cpp index 26f1bdccf00..1f22cd68a9f 100644 --- a/src/lib/formats/sol_cas.cpp +++ b/src/lib/formats/sol_cas.cpp @@ -342,7 +342,7 @@ static int sol20_cassette_calculate_size_in_samples(const UINT8 *bytes, int leng { sol20_image_size = length; - return sol20_handle_cassette(NULL, bytes); + return sol20_handle_cassette(nullptr, bytes); } static const struct CassetteLegacyWaveFiller sol20_legacy_fill_wave = @@ -371,7 +371,7 @@ static const struct CassetteFormat sol20_cassette_image_format = "svt", sol20_cassette_identify, sol20_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(sol20_cassette_formats) diff --git a/src/lib/formats/sorc_cas.cpp b/src/lib/formats/sorc_cas.cpp index 6983dd0ba74..a900f77d5e5 100644 --- a/src/lib/formats/sorc_cas.cpp +++ b/src/lib/formats/sorc_cas.cpp @@ -121,7 +121,7 @@ static int sorcerer_cassette_calculate_size_in_samples(const UINT8 *bytes, int l { sorcerer_image_size = length; - return sorcerer_handle_cassette(NULL, bytes); + return sorcerer_handle_cassette(nullptr, bytes); } static const struct CassetteLegacyWaveFiller sorcerer_legacy_fill_wave = @@ -150,7 +150,7 @@ static const struct CassetteFormat sorcerer_cassette_image_format = "tape", sorcerer_cassette_identify, sorcerer_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(sorcerer_cassette_formats) diff --git a/src/lib/formats/sorc_dsk.cpp b/src/lib/formats/sorc_dsk.cpp index 5e59d30cdb1..27dc4270f05 100644 --- a/src/lib/formats/sorc_dsk.cpp +++ b/src/lib/formats/sorc_dsk.cpp @@ -107,7 +107,7 @@ static floperr_t sorc_write_indexed_sector(floppy_image_legacy *floppy, int head static floperr_t sorc_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length) { 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; @@ -156,5 +156,5 @@ static FLOPPY_CONSTRUCT(sorc_dsk_construct) /* ----------------------------------------------------------------------- */ LEGACY_FLOPPY_OPTIONS_START( sorcerer ) - LEGACY_FLOPPY_OPTION( sorc_dsk, "dsk", "Exidy Sorcerer floppy disk image", sorc_dsk_identify, sorc_dsk_construct, NULL, NULL) + LEGACY_FLOPPY_OPTION( sorc_dsk, "dsk", "Exidy Sorcerer floppy disk image", sorc_dsk_identify, sorc_dsk_construct, nullptr, nullptr) LEGACY_FLOPPY_OPTIONS_END diff --git a/src/lib/formats/sord_cas.cpp b/src/lib/formats/sord_cas.cpp index eb8a27bdba4..39de0fbca84 100644 --- a/src/lib/formats/sord_cas.cpp +++ b/src/lib/formats/sord_cas.cpp @@ -133,7 +133,7 @@ static const struct CassetteFormat sordm5_cas_format = "cas", sordm5_tap_identify, sordm5_tap_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(sordm5_cassette_formats) diff --git a/src/lib/formats/spc1000_cas.cpp b/src/lib/formats/spc1000_cas.cpp index b05844b6ee7..3c86305e8a8 100644 --- a/src/lib/formats/spc1000_cas.cpp +++ b/src/lib/formats/spc1000_cas.cpp @@ -108,14 +108,14 @@ static int spc1000_tap_calculate_size_in_samples(const UINT8 *bytes, int length) { spc1000_image_size = length; - return spc1000_handle_tap(NULL, bytes); + return spc1000_handle_tap(nullptr, bytes); } static int spc1000_cas_calculate_size_in_samples(const UINT8 *bytes, int length) { spc1000_image_size = length; - return spc1000_handle_cas(NULL, bytes); + return spc1000_handle_cas(nullptr, bytes); } @@ -151,7 +151,7 @@ static const struct CassetteFormat spc1000_tap_cassette_image_format = "tap", spc1000_tap_cassette_identify, spc1000_tap_cassette_load, - NULL + nullptr }; @@ -182,7 +182,7 @@ static const struct CassetteFormat spc1000_cas_cassette_image_format = "cas", spc1000_cas_cassette_identify, spc1000_cas_cassette_load, - NULL + nullptr }; diff --git a/src/lib/formats/svi_cas.cpp b/src/lib/formats/svi_cas.cpp index dd2bde8d5a1..a95c3b97fb5 100644 --- a/src/lib/formats/svi_cas.cpp +++ b/src/lib/formats/svi_cas.cpp @@ -203,7 +203,7 @@ static const struct CassetteFormat svi_cas_format = "cas", svi_cas_identify, svi_cas_load, - NULL + nullptr }; diff --git a/src/lib/formats/td0_dsk.cpp b/src/lib/formats/td0_dsk.cpp index 185bb21cfed..600a6868a4e 100644 --- a/src/lib/formats/td0_dsk.cpp +++ b/src/lib/formats/td0_dsk.cpp @@ -298,7 +298,7 @@ static floperr_t td0_read_indexed_sector(floppy_image_legacy *floppy, int head, static floperr_t td0_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length) { 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; @@ -699,7 +699,7 @@ FLOPPY_CONSTRUCT( td0_dsk_construct ) return FLOPPY_ERROR_OUTOFMEMORY; tag->data = (UINT8*)malloc(floppy_image_size(floppy)); - if (tag->data==NULL) { + if (tag->data==nullptr) { return FLOPPY_ERROR_OUTOFMEMORY; } floppy_image_read(floppy, tag->data, 0, floppy_image_size(floppy)); @@ -720,7 +720,7 @@ FLOPPY_CONSTRUCT( td0_dsk_construct ) memcpy(obuf,tag->data,12); free(tag->data); tag->data = (UINT8*)malloc(size+12); - if (tag->data==NULL) { + if (tag->data==nullptr) { return FLOPPY_ERROR_OUTOFMEMORY; } memcpy(tag->data,obuf,12); @@ -786,7 +786,7 @@ FLOPPY_DESTRUCT( td0_dsk_destruct ) { struct td0dsk_tag *tag = get_tag(floppy); free(tag->data); - tag->data = NULL; + tag->data = nullptr; return FLOPPY_ERROR_SUCCESS; } @@ -999,7 +999,7 @@ bool td0_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) sdatapos += size; } else - sects[i].data = NULL; + sects[i].data = nullptr; } track_count = track; diff --git a/src/lib/formats/thom_cas.cpp b/src/lib/formats/thom_cas.cpp index 9fd6d6f0208..799e96c38ca 100644 --- a/src/lib/formats/thom_cas.cpp +++ b/src/lib/formats/thom_cas.cpp @@ -119,7 +119,7 @@ static casserr_t to7_k7_load( cassette_image *cass ) if ( to7_k7_bits ) { free( to7_k7_bits ); - to7_k7_bits = NULL; + to7_k7_bits = nullptr; } to7_k7_bitsize = 0; @@ -366,7 +366,7 @@ static casserr_t to7_k7_load( cassette_image *cass ) static const struct CassetteFormat to7_k7 = -{ "k7", to7_k7_identify, to7_k7_load, NULL /* no save */ }; +{ "k7", to7_k7_identify, to7_k7_load, nullptr /* no save */ }; @@ -392,7 +392,7 @@ static casserr_t to7_wav_load ( cassette_image *cass ) if ( to7_k7_bits ) { free( to7_k7_bits ); - to7_k7_bits = NULL; + to7_k7_bits = nullptr; } if ( e != CASSETTE_ERROR_SUCCESS ) @@ -730,7 +730,7 @@ static casserr_t mo5_k5_load( cassette_image *cass ) static const struct CassetteFormat mo5_k5 = -{ "k5,k7", mo5_k5_identify, mo5_k5_load, NULL /* no save */ }; +{ "k5,k7", mo5_k5_identify, mo5_k5_load, nullptr /* no save */ }; /********************* MO5 WAV format ************************/ @@ -781,8 +781,8 @@ static const struct CassetteFormat mo5_wav = const struct CassetteFormat *const to7_cassette_formats[] = -{ &to7_wav, &to7_k7, NULL }; +{ &to7_wav, &to7_k7, nullptr }; const struct CassetteFormat *const mo5_cassette_formats[] = -{ &mo5_wav, &mo5_k5, NULL }; +{ &mo5_wav, &mo5_k5, nullptr }; diff --git a/src/lib/formats/thom_dsk.cpp b/src/lib/formats/thom_dsk.cpp index ed9d977b723..da7187d65f8 100644 --- a/src/lib/formats/thom_dsk.cpp +++ b/src/lib/formats/thom_dsk.cpp @@ -175,7 +175,7 @@ static floperr_t sap_write_indexed_sector(floppy_image_legacy *floppy, int head, static floperr_t sap_get_sector_length(floppy_image_legacy *floppy, int head, int track, int sector, UINT32 *sector_length) { 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; @@ -353,37 +353,37 @@ static FLOPPY_CONSTRUCT(qdd_dsk_construct) LEGACY_FLOPPY_OPTIONS_START(thomson) - LEGACY_FLOPPY_OPTION(fdmfm2, "fd", "Thomson FD (MFM) 80 tracks disk image (3\"1/2 DD)", basicdsk_identify_default, basicdsk_construct_default, NULL, + LEGACY_FLOPPY_OPTION(fdmfm2, "fd", "Thomson FD (MFM) 80 tracks disk image (3\"1/2 DD)", basicdsk_identify_default, basicdsk_construct_default, nullptr, HEADS([1]) TRACKS([80]) SECTORS([16]) SECTOR_LENGTH([256]) FIRST_SECTOR_ID([1])) - LEGACY_FLOPPY_OPTION(fdmfm, "fd", "Thomson FD (MFM) 40 tracks disk image (5\"1/4 DD)", basicdsk_identify_default, basicdsk_construct_default, NULL, + LEGACY_FLOPPY_OPTION(fdmfm, "fd", "Thomson FD (MFM) 40 tracks disk image (5\"1/4 DD)", basicdsk_identify_default, basicdsk_construct_default, nullptr, HEADS([1]) TRACKS([40]) SECTORS([16]) SECTOR_LENGTH([256]) FIRST_SECTOR_ID([1])) - LEGACY_FLOPPY_OPTION(fd2, "fd", "Thomson FD (FM) 80 tracks disk image (3\"1/2 SD)", basicdsk_identify_default, basicdsk_construct_default, NULL, + LEGACY_FLOPPY_OPTION(fd2, "fd", "Thomson FD (FM) 80 tracks disk image (3\"1/2 SD)", basicdsk_identify_default, basicdsk_construct_default, nullptr, HEADS([1]) TRACKS([80]) SECTORS([16]) SECTOR_LENGTH([128]) FIRST_SECTOR_ID([1])) - LEGACY_FLOPPY_OPTION(fd, "fd", "Thomson FD (FM) 40 tracks disk image (5\"1/4 SD)", basicdsk_identify_default, basicdsk_construct_default, NULL, + LEGACY_FLOPPY_OPTION(fd, "fd", "Thomson FD (FM) 40 tracks disk image (5\"1/4 SD)", basicdsk_identify_default, basicdsk_construct_default, nullptr, HEADS([1]) TRACKS([40]) SECTORS([16]) SECTOR_LENGTH([128]) FIRST_SECTOR_ID([1])) - LEGACY_FLOPPY_OPTION(sap,"sap", "Thomson SAP floppy disk image", sap_dsk_identify, sap_dsk_construct, NULL, NULL) + LEGACY_FLOPPY_OPTION(sap,"sap", "Thomson SAP floppy disk image", sap_dsk_identify, sap_dsk_construct, nullptr, nullptr) - LEGACY_FLOPPY_OPTION(qdd,"qd", "Thomson QDD floppy disk image (2\"8 SD)", qdd_dsk_identify, qdd_dsk_construct, NULL, + LEGACY_FLOPPY_OPTION(qdd,"qd", "Thomson QDD floppy disk image (2\"8 SD)", qdd_dsk_identify, qdd_dsk_construct, nullptr, HEADS([1]) TRACKS([1]) SECTORS([400]) diff --git a/src/lib/formats/trs_cas.cpp b/src/lib/formats/trs_cas.cpp index a4f748dea05..5e205348768 100644 --- a/src/lib/formats/trs_cas.cpp +++ b/src/lib/formats/trs_cas.cpp @@ -96,7 +96,7 @@ static int trs80l2_cas_to_wav_size(const UINT8 *casdata, int caslen) { cas_size = caslen; - return trs80l2_handle_cas( NULL, casdata ); + return trs80l2_handle_cas( nullptr, casdata ); } static const struct CassetteLegacyWaveFiller trs80l2_cas_legacy_fill_wave = @@ -128,7 +128,7 @@ static const struct CassetteFormat trs80l2_cas_format = "cas", trs80l2_cas_identify, trs80l2_cas_load, - NULL + nullptr }; diff --git a/src/lib/formats/tvc_cas.cpp b/src/lib/formats/tvc_cas.cpp index a33fba687b9..7dad5dac819 100644 --- a/src/lib/formats/tvc_cas.cpp +++ b/src/lib/formats/tvc_cas.cpp @@ -221,7 +221,7 @@ static const struct CassetteFormat tvc64_cassette_image_format = "cas", tvc64_cassette_identify, tvc64_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(tvc64_cassette_formats) diff --git a/src/lib/formats/tzx_cas.cpp b/src/lib/formats/tzx_cas.cpp index e210afff8b7..498de384e53 100644 --- a/src/lib/formats/tzx_cas.cpp +++ b/src/lib/formats/tzx_cas.cpp @@ -66,7 +66,7 @@ static const UINT8 TZX_HEADER[8] = { 'Z','X','T','a','p','e','!',0x1a }; static INT16 wave_data = 0; static int block_count = 0; -static UINT8** blocks = NULL; +static UINT8** blocks = nullptr; static float t_scale = 1; /* for scaling T-states to the 4MHz CPC */ static void toggle_wave_data(void) @@ -219,7 +219,7 @@ INLINE int tcycles_to_samplecount( int tcycles ) static void tzx_output_wave( INT16 **buffer, int length ) { - if (buffer == NULL) + if (buffer == nullptr) { return; } @@ -805,7 +805,7 @@ static int tzx_cas_to_wav_size( const UINT8 *casdata, int caslen ) goto cleanup; } - size = tzx_cas_do_work(NULL); + size = tzx_cas_do_work(nullptr); return size; @@ -843,7 +843,7 @@ static int tap_cas_to_wav_size( const UINT8 *casdata, int caslen ) // int pilot_length = (p[2] == 0x00) ? 8063 : 3223; /* worldofspectrum */ LOG_FORMATS("tap_cas_to_wav_size: Handling TAP block containing 0x%X bytes", data_size); p += 2; - size += tzx_cas_handle_block(NULL, p, 1000, data_size, 2168, pilot_length, 667, 735, 855, 1710, 8); + size += tzx_cas_handle_block(nullptr, p, 1000, data_size, 2168, pilot_length, 667, 735, 855, 1710, 8); LOG_FORMATS(", total size is now: %d\n", size); p += data_size; } @@ -936,7 +936,7 @@ static const struct CassetteFormat tzx_cassette_format = "tzx", tzx_cassette_identify, tzx_cassette_load, - NULL + nullptr }; static const struct CassetteFormat tap_cassette_format = @@ -944,7 +944,7 @@ static const struct CassetteFormat tap_cassette_format = "tap,blk", tap_cassette_identify, tap_cassette_load, - NULL + nullptr }; static const struct CassetteFormat cdt_cassette_format = @@ -952,7 +952,7 @@ static const struct CassetteFormat cdt_cassette_format = "cdt", cdt_cassette_identify, cdt_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(tzx_cassette_formats) diff --git a/src/lib/formats/uef_cas.cpp b/src/lib/formats/uef_cas.cpp index f078ae776c4..6db1716348b 100644 --- a/src/lib/formats/uef_cas.cpp +++ b/src/lib/formats/uef_cas.cpp @@ -50,7 +50,7 @@ static const UINT8* skip_gz_header( const UINT8 *p ) { method = *p; p++; flags = *p; p++; if ( method != Z_DEFLATED || ( flags & RESERVED ) != 0 ) { - return NULL; + return nullptr; } /* Skip time, xflags and OS code */ p += 6; @@ -75,7 +75,7 @@ static const UINT8* skip_gz_header( const UINT8 *p ) { return p; } -static UINT8 *gz_ptr = NULL; +static UINT8 *gz_ptr = nullptr; static float get_uef_float( const UINT8 *Float) { @@ -114,14 +114,14 @@ static int uef_cas_to_wav_size( const UINT8 *casdata, int caslen ) { int inflate_size = ( casdata[ caslen - 1 ] << 24 ) | ( casdata[ caslen - 2 ] << 16 ) | ( casdata[ caslen - 3 ] << 8 ) | casdata[ caslen - 4 ]; const UINT8 *in_ptr = skip_gz_header( casdata ); - if ( in_ptr == NULL ) { + if ( in_ptr == nullptr ) { goto cleanup; } gz_ptr = (UINT8 *)malloc( inflate_size ); - d_stream.zalloc = 0; - d_stream.zfree = 0; - d_stream.opaque = 0; + d_stream.zalloc = nullptr; + d_stream.zfree = nullptr; + d_stream.opaque = nullptr; d_stream.next_in = (unsigned char *)in_ptr; d_stream.avail_in = caslen - ( in_ptr - casdata ); d_stream.next_out = gz_ptr; @@ -207,7 +207,7 @@ static int uef_cas_to_wav_size( const UINT8 *casdata, int caslen ) { cleanup: if ( gz_ptr ) { free( gz_ptr ); - gz_ptr = NULL; + gz_ptr = nullptr; } return -1; } @@ -232,7 +232,7 @@ static int uef_cas_fill_wave( INT16 *buffer, int length, UINT8 *bytes ) { INT16 *p = buffer; if ( bytes[0] == 0x1f && bytes[1] == 0x8b ) { - if ( gz_ptr == NULL ) { + if ( gz_ptr == nullptr ) { return 1; } bytes = gz_ptr; @@ -327,7 +327,7 @@ const struct CassetteFormat uef_cassette_format = { "uef", uef_cassette_identify, uef_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(uef_cassette_formats) diff --git a/src/lib/formats/vg5k_cas.cpp b/src/lib/formats/vg5k_cas.cpp index ef648707fd8..6c10112ab30 100644 --- a/src/lib/formats/vg5k_cas.cpp +++ b/src/lib/formats/vg5k_cas.cpp @@ -196,7 +196,7 @@ static int vg5k_k7_to_wav_size(const UINT8 *casdata, int caslen) { k7_size = caslen ; - return vg5k_handle_tap( NULL, casdata ); + return vg5k_handle_tap( nullptr, casdata ); } @@ -228,7 +228,7 @@ static const struct CassetteFormat vg5k_k7_format = "k7", vg5k_k7_identify, vg5k_k7_load, - NULL + nullptr }; diff --git a/src/lib/formats/vt_cas.cpp b/src/lib/formats/vt_cas.cpp index d0910efcc84..91e5f69ba64 100644 --- a/src/lib/formats/vt_cas.cpp +++ b/src/lib/formats/vt_cas.cpp @@ -102,7 +102,7 @@ static const struct CassetteLegacyWaveFiller vtech1_legacy_fill_wave = vtech1_cassette_fill_wave, /* fill_wave */ 1, /* chunk_size */ V1_BYTESAMPLES, /* chunk_samples */ - NULL, /* chunk_sample_calc */ + nullptr, /* chunk_sample_calc */ 600*V1_BITSAMPLES, /* sample_frequency */ 600*V1_BITSAMPLES, /* header_samples */ 600*V1_BITSAMPLES /* trailer_samples */ @@ -123,7 +123,7 @@ static const struct CassetteFormat vtech1_cas_format = "cas", vtech1_cas_identify, vtech1_cas_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(vtech1_cassette_formats) @@ -197,7 +197,7 @@ static const struct CassetteLegacyWaveFiller vtech2_legacy_fill_wave = vtech2_cassette_fill_wave, /* fill_wave */ 1, /* chunk_size */ VT2_BYTESAMPLES, /* chunk_samples */ - NULL, /* chunk_sample_calc */ + nullptr, /* chunk_sample_calc */ 600*VT2_BITSAMPLES, /* sample_frequency */ 600*VT2_BITSAMPLES, /* header_samples */ 600*VT2_BITSAMPLES /* trailer_samples */ @@ -218,7 +218,7 @@ static const struct CassetteFormat vtech2_cas_format = "cas", vtech2_cas_identify, vtech2_cas_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(vtech2_cassette_formats) diff --git a/src/lib/formats/x07_cas.cpp b/src/lib/formats/x07_cas.cpp index 54f46acd488..0c36ad7c3e8 100644 --- a/src/lib/formats/x07_cas.cpp +++ b/src/lib/formats/x07_cas.cpp @@ -137,7 +137,7 @@ static int x07_cassette_calculate_size_in_samples(const UINT8 *bytes, int length { x07_image_size = length; - return x07_handle_cassette(NULL, bytes); + return x07_handle_cassette(nullptr, bytes); } static const struct CassetteLegacyWaveFiller x07_legacy_fill_wave = @@ -166,7 +166,7 @@ static const struct CassetteFormat x07_cassette_image_format = "k7,lst,cas", x07_cassette_identify, x07_cassette_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(x07_cassette_formats) diff --git a/src/lib/formats/x1_tap.cpp b/src/lib/formats/x1_tap.cpp index 5cf6f9fef94..f66ca7d4431 100644 --- a/src/lib/formats/x1_tap.cpp +++ b/src/lib/formats/x1_tap.cpp @@ -131,7 +131,7 @@ static const struct CassetteFormat x1_cassette_format = { "tap", x1_cas_identify, x1_cas_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(x1_cassette_formats) diff --git a/src/lib/formats/zx81_p.cpp b/src/lib/formats/zx81_p.cpp index 9a556f05ce5..5e6af375468 100644 --- a/src/lib/formats/zx81_p.cpp +++ b/src/lib/formats/zx81_p.cpp @@ -226,7 +226,7 @@ static const struct CassetteFormat zx81_p_image_format = "p,81", zx81_p_identify, zx81_p_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(zx81_p_format) @@ -289,7 +289,7 @@ static const struct CassetteFormat zx80_o_image_format = "o,80", zx80_o_identify, zx80_o_load, - NULL + nullptr }; CASSETTE_FORMATLIST_START(zx80_o_format) diff --git a/src/lib/util/chd.cpp b/src/lib/util/chd.cpp index 9f1b79081c5..38881cc8d81 100644 --- a/src/lib/util/chd.cpp +++ b/src/lib/util/chd.cpp @@ -1249,7 +1249,7 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex // read the metadata // TODO: how to properly allocate a dynamic char buffer? - auto metabuf = new char[metaentry.length+1]; + auto metabuf = new char[metaentry.length+1]; memset(metabuf, 0x00, metaentry.length+1); file_read(metaentry.offset + METADATA_HEADER_SIZE, metabuf, metaentry.length); output.assign(metabuf); diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp index c644fef9657..0a8ace7d9f3 100644 --- a/src/lib/util/options.cpp +++ b/src/lib/util/options.cpp @@ -255,7 +255,7 @@ bool core_options::operator!=(const core_options &rhs) void core_options::add_entry(const char *name, const char *description, UINT32 flags, const char *defvalue, bool override_existing) { // allocate a new entry - auto newentry = global_alloc(entry(name, description, flags, defvalue)); + auto newentry = global_alloc(entry(name, description, flags, defvalue)); if (newentry->name() != nullptr) { // see if we match an existing entry diff --git a/src/lib/util/tagmap.h b/src/lib/util/tagmap.h index 600cc230985..75a67ac67ef 100644 --- a/src/lib/util/tagmap.h +++ b/src/lib/util/tagmap.h @@ -327,7 +327,7 @@ tagmap_error tagmap_t<_ElementType, _HashSize>::add_common(const char *tag, _Ele } // now allocate a new entry and add to the head of the list - auto entry = global_alloc(entry_t(tag, fullhash, object)); + auto entry = global_alloc(entry_t(tag, fullhash, object)); entry->m_next = m_table[hashindex]; m_table[hashindex] = entry; return TMERR_NONE; diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp index 2598f481ca6..49ae108e881 100644 --- a/src/osd/modules/debugger/debugint.cpp +++ b/src/osd/modules/debugger/debugint.cpp @@ -28,7 +28,7 @@ class debug_internal : public osd_module, public debug_module public: debug_internal() : osd_module(OSD_DEBUG_PROVIDER, "internal"), debug_module(), - m_machine(NULL) + m_machine(nullptr) { } @@ -150,7 +150,7 @@ class DView_edit DISABLE_COPYING(DView_edit); public: - DView_edit(): active(0), container(NULL) { } + DView_edit(): active(0), container(nullptr) { } ~DView_edit() { } int active; render_container * container; @@ -170,7 +170,7 @@ class DView public: DView(render_target *target, running_machine &machine, debug_view_type type, int flags) - : next(NULL), + : next(nullptr), type(0), state(0), ofs_x(0), @@ -205,7 +205,7 @@ public: machine().debug_view().free_view(*this->view); } - running_machine &machine() const { assert(m_machine != NULL); return *m_machine; } + running_machine &machine() const { assert(m_machine != nullptr); return *m_machine; } DView * next; @@ -259,11 +259,11 @@ INLINE void dview_set_state(DView *dv, int state, int onoff) LOCAL VARIABLES ***************************************************************************/ -static render_font * debug_font = NULL; +static render_font * debug_font = nullptr; static int debug_font_width; static int debug_font_height; static float debug_font_aspect; -static DView * list = NULL; +static DView * list = nullptr; static DView * focus_view; static ui_menu * menu; @@ -271,10 +271,10 @@ static DView_edit * cur_editor; static void set_focus_view(DView *dv) { - if (focus_view != NULL) + if (focus_view != nullptr) dview_set_state(focus_view, VIEW_STATE_NEEDS_UPDATE, TRUE); - if (dv != NULL) + if (dv != nullptr) dview_set_state(dv, VIEW_STATE_NEEDS_UPDATE, TRUE); if (focus_view != dv) @@ -863,16 +863,16 @@ static void dview_update(debug_view &dw, void *osdprivate) void debug_internal::exit() { - for (DView *ndv = list; ndv != NULL; ) + for (DView *ndv = list; ndv != nullptr; ) { DView *temp = ndv; ndv = ndv->next; dview_free(temp); } - if (debug_font != NULL) + if (debug_font != nullptr) { m_machine->render().font_free(debug_font); - debug_font = NULL; + debug_font = nullptr; } if (menu) global_free(menu); @@ -889,10 +889,10 @@ void debug_internal::init_debugger(running_machine &machine) debug_font_width = 0; debug_font_height = 15; - menu = NULL; - cur_editor = NULL; - list = NULL; - focus_view = NULL; + menu = nullptr; + cur_editor = nullptr; + list = nullptr; + focus_view = nullptr; debug_font_aspect = m_machine->render().ui_aspect(); @@ -980,7 +980,7 @@ static void on_disasm_cpu_activate(DView *dv, const ui_menu_event *event) if (event->iptkey == IPT_UI_RIGHT) { current = current->next(); - if (current == NULL) + if (current == nullptr) current = dv->view->first_source(); dv->view->set_source(*current); dview_set_state(dv, VIEW_STATE_NEEDS_UPDATE, TRUE); @@ -1111,7 +1111,7 @@ static void render_editor(DView_edit *editor) editor->container->empty(); /* get the size of the text */ editor->container->manager().machine().ui().draw_text_full(editor->container, editor->str.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, NULL); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(width, 0.5f); @@ -1131,7 +1131,7 @@ static void render_editor(DView_edit *editor) /* draw the text within it */ editor->container->manager().machine().ui().draw_text_full(editor->container, editor->str.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, NULL, NULL); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } @@ -1176,8 +1176,8 @@ static void CreateMainMenu(running_machine &machine) break; } - menu->item_append(title.append(focus_view->title).c_str(), NULL, MENU_FLAG_DISABLE, NULL); - menu->item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL); + menu->item_append(title.append(focus_view->title).c_str(), nullptr, MENU_FLAG_DISABLE, nullptr); + menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); switch (focus_view->type) { @@ -1191,37 +1191,37 @@ static void CreateMainMenu(running_machine &machine) case DASM_RIGHTCOL_COMMENTS: subtext = "Comments"; break; } menu->item_append("View", subtext, MENU_FLAG_RIGHT_ARROW, (void *)on_view_opcodes_activate); - menu->item_append("Run to cursor", NULL, 0, (void *)on_run_to_cursor_activate); + menu->item_append("Run to cursor", nullptr, 0, (void *)on_run_to_cursor_activate); if (!dview_is_state(focus_view, VIEW_STATE_FOLLOW_CPU)) { menu->item_append("CPU", focus_view->view->source()->name(), MENU_FLAG_RIGHT_ARROW, (void *)on_disasm_cpu_activate); } - menu->item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL); + menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); break; } } /* add input menu items */ - menu->item_append("New Memory Window", NULL, 0, (void *)on_memory_window_activate); - menu->item_append("New Disassembly Window", NULL, 0, (void *)on_disassembly_window_activate); - menu->item_append("New Error Log Window", NULL, 0, (void *)on_log_window_activate); - menu->item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL); - menu->item_append("Run", NULL, 0, (void *)on_run_activate); - menu->item_append("Run to Next CPU", NULL, 0, (void *)on_run_cpu_activate); - menu->item_append("Run until Next Interrupt on This CPU", NULL, 0, (void *)on_run_irq_activate); - menu->item_append("Run until Next VBLANK", NULL, 0, (void *)on_run_vbl_activate); - menu->item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL); - menu->item_append("Step Into", NULL, 0, (void *)on_step_into_activate); - menu->item_append("Step Over", NULL, 0, (void *)on_step_over_activate); - menu->item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL); - menu->item_append("Soft Reset", NULL, 0, (void *)on_soft_reset_activate); - menu->item_append("Hard Reset", NULL, 0, (void *)on_hard_reset_activate); - menu->item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL); + menu->item_append("New Memory Window", nullptr, 0, (void *)on_memory_window_activate); + menu->item_append("New Disassembly Window", nullptr, 0, (void *)on_disassembly_window_activate); + menu->item_append("New Error Log Window", nullptr, 0, (void *)on_log_window_activate); + menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); + menu->item_append("Run", nullptr, 0, (void *)on_run_activate); + menu->item_append("Run to Next CPU", nullptr, 0, (void *)on_run_cpu_activate); + menu->item_append("Run until Next Interrupt on This CPU", nullptr, 0, (void *)on_run_irq_activate); + menu->item_append("Run until Next VBLANK", nullptr, 0, (void *)on_run_vbl_activate); + menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); + menu->item_append("Step Into", nullptr, 0, (void *)on_step_into_activate); + menu->item_append("Step Over", nullptr, 0, (void *)on_step_over_activate); + menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); + menu->item_append("Soft Reset", nullptr, 0, (void *)on_soft_reset_activate); + menu->item_append("Hard Reset", nullptr, 0, (void *)on_hard_reset_activate); + menu->item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); if (!dview_is_state(focus_view, VIEW_STATE_FOLLOW_CPU)) - menu->item_append("Close Window", NULL, 0, (void *)on_close_activate); - menu->item_append("Exit", NULL, 0, (void *)on_exit_activate); + menu->item_append("Close Window", nullptr, 0, (void *)on_close_activate); + menu->item_append("Exit", nullptr, 0, (void *)on_exit_activate); } static int map_point(DView *dv, INT32 target_x, INT32 target_y, INT32 *mapped_x, INT32 *mapped_y) @@ -1254,16 +1254,16 @@ static void handle_mouse(running_machine &machine) INT32 x,y; bool button; - if (menu != NULL) + if (menu != nullptr) return; mouse_target = ui_input_find_mouse(machine, &x, &y, &button); - if (mouse_target == NULL) + if (mouse_target == nullptr) return; //printf("mouse %d %d %d\n", x, y, button); - for (DView *dv = list; dv != NULL; dv = dv->next) + for (DView *dv = list; dv != nullptr; dv = dv->next) { if (mouse_target == dv->target) { @@ -1313,17 +1313,17 @@ static void handle_editor(running_machine &machine) break; } } - if (cur_editor != NULL) + if (cur_editor != nullptr) { render_editor(cur_editor); if (ui_input_pressed(machine, IPT_UI_SELECT)) { process_string(focus_view, focus_view->editor.str.c_str()); focus_view->editor.str = ""; - cur_editor = NULL; + cur_editor = nullptr; } if (ui_input_pressed(machine, IPT_UI_CANCEL)) - cur_editor = NULL; + cur_editor = nullptr; } } @@ -1340,11 +1340,11 @@ static void handle_menus(running_machine &machine) machine.render().ui_container().empty(); ui_input_frame_update(machine); - if (menu != NULL) + if (menu != nullptr) { /* process the menu */ event = menu->process(0); - if (event != NULL && (event->iptkey == IPT_UI_SELECT || (event->iptkey == IPT_UI_RIGHT))) + if (event != nullptr && (event->iptkey == IPT_UI_SELECT || (event->iptkey == IPT_UI_RIGHT))) { //global_free(menu); //menu = NULL; @@ -1355,7 +1355,7 @@ static void handle_menus(running_machine &machine) else if (ui_input_pressed(machine, IPT_UI_CONFIGURE)) { global_free(menu); - menu = NULL; + menu = nullptr; } } else @@ -1378,7 +1378,7 @@ static void followers_set_cpu(device_t *device) { std::string title; - for (DView *dv = list; dv != NULL; dv = dv->next) + for (DView *dv = list; dv != nullptr; dv = dv->next) { if (dview_is_state(dv, VIEW_STATE_FOLLOW_CPU)) { @@ -1420,7 +1420,7 @@ static void update_views(void) DView *dv, *prev; LIST_GET_LAST(list, dv); - while (dv != NULL) + while (dv != nullptr) { dview_update_view(dv); LIST_GET_PREVIOUS(list, dv, prev); @@ -1431,7 +1431,7 @@ static void update_views(void) void debug_internal::wait_for_debugger(device_t &device, bool firststop) { - if (firststop && list == NULL) + if (firststop && list == nullptr) { render_target *target = &device.machine().render().ui_target(); @@ -1463,7 +1463,7 @@ void debug_internal::wait_for_debugger(device_t &device, bool firststop) void debug_internal::debugger_update() { - if ((m_machine != NULL) && (!debug_cpu_is_stopped(*m_machine)) && (m_machine->phase() == MACHINE_PHASE_RUNNING)) + if ((m_machine != nullptr) && (!debug_cpu_is_stopped(*m_machine)) && (m_machine->phase() == MACHINE_PHASE_RUNNING)) { update_views(); } diff --git a/src/osd/modules/debugger/none.cpp b/src/osd/modules/debugger/none.cpp index 48085afd089..f6b22a1883a 100644 --- a/src/osd/modules/debugger/none.cpp +++ b/src/osd/modules/debugger/none.cpp @@ -16,7 +16,7 @@ class debug_none : public osd_module, public debug_module public: debug_none() : osd_module(OSD_DEBUG_PROVIDER, "none"), debug_module(), - m_machine(NULL) + m_machine(nullptr) { } diff --git a/src/osd/modules/debugger/win/debugbaseinfo.cpp b/src/osd/modules/debugger/win/debugbaseinfo.cpp index 66824b9f029..9f53899affd 100644 --- a/src/osd/modules/debugger/win/debugbaseinfo.cpp +++ b/src/osd/modules/debugger/win/debugbaseinfo.cpp @@ -25,7 +25,7 @@ void debugbase_info::smart_set_window_bounds(HWND wnd, HWND parent, RECT const & // first get the current bounds, relative to the parent GetWindowRect(wnd, &curbounds); - if (parent != NULL) + if (parent != nullptr) { RECT parentbounds; GetWindowRect(parent, &parentbounds); @@ -44,7 +44,7 @@ void debugbase_info::smart_set_window_bounds(HWND wnd, HWND parent, RECT const & // if we need to, reposition the window if (flags != (SWP_NOMOVE | SWP_NOSIZE)) - SetWindowPos(wnd, NULL, + SetWindowPos(wnd, nullptr, bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER | flags); diff --git a/src/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h index 78c088a5eef..08e08d79de9 100644 --- a/src/osd/modules/debugger/win/debugwininfo.h +++ b/src/osd/modules/debugger/win/debugwininfo.h @@ -24,7 +24,7 @@ public: debugwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler); virtual ~debugwin_info(); - bool is_valid() const { return m_wnd != NULL; } + bool is_valid() const { return m_wnd != nullptr; } debugwin_info *next() const { return m_next; } void set_ignore_char_lparam(LPARAM value) { m_ignore_char_lparam = value >> 16; } diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.cpp b/src/osd/modules/debugger/win/disasmbasewininfo.cpp index 783cc8d75fa..f7f516ca24c 100644 --- a/src/osd/modules/debugger/win/disasmbasewininfo.cpp +++ b/src/osd/modules/debugger/win/disasmbasewininfo.cpp @@ -25,7 +25,7 @@ disasmbasewin_info::disasmbasewin_info(debugger_windows_interface &debugger, boo return; m_views[0].reset(global_alloc(disasmview_info(debugger, *this, window()))); - if ((m_views[0] == NULL) || !m_views[0]->is_valid()) + if ((m_views[0] == nullptr) || !m_views[0]->is_valid()) { m_views[0].reset(); return; @@ -115,10 +115,10 @@ void disasmbasewin_info::update_menu() // first find an existing breakpoint at this address device_debug::breakpoint *bp = debug->breakpoint_first(); - while ((bp != NULL) && (bp->address() != address)) + while ((bp != nullptr) && (bp->address() != address)) bp = bp->next(); - if (bp == NULL) + if (bp == nullptr) { ModifyMenu(menu, ID_TOGGLE_BREAKPOINT, MF_BYCOMMAND, ID_TOGGLE_BREAKPOINT, TEXT("Set breakpoint at cursor\tF9")); ModifyMenu(menu, ID_DISABLE_BREAKPOINT, MF_BYCOMMAND, ID_DISABLE_BREAKPOINT, TEXT("Disable breakpoint at cursor\tShift+F9")); @@ -131,7 +131,7 @@ void disasmbasewin_info::update_menu() else ModifyMenu(menu, ID_DISABLE_BREAKPOINT, MF_BYCOMMAND, ID_DISABLE_BREAKPOINT, TEXT("Enable breakpoint at cursor\tShift+F9")); } - bool const available = (bp != NULL) && (!is_main_console() || dasmview->source_is_visible_cpu()); + bool const available = (bp != nullptr) && (!is_main_console() || dasmview->source_is_visible_cpu()); EnableMenuItem(menu, ID_DISABLE_BREAKPOINT, MF_BYCOMMAND | (available ? MF_ENABLED : MF_GRAYED)); } else @@ -168,7 +168,7 @@ bool disasmbasewin_info::handle_command(WPARAM wparam, LPARAM lparam) INT32 bpindex = -1; // first find an existing breakpoint at this address - for (device_debug::breakpoint *bp = debug->breakpoint_first(); bp != NULL; bp = bp->next()) + for (device_debug::breakpoint *bp = debug->breakpoint_first(); bp != nullptr; bp = bp->next()) { if (address == bp->address()) { @@ -182,7 +182,7 @@ bool disasmbasewin_info::handle_command(WPARAM wparam, LPARAM lparam) { if (bpindex == -1) { - bpindex = debug->breakpoint_set(address, NULL, NULL); + bpindex = debug->breakpoint_set(address, nullptr, nullptr); debug_console_printf(machine(), "Breakpoint %X set\n", bpindex); } else @@ -213,11 +213,11 @@ bool disasmbasewin_info::handle_command(WPARAM wparam, LPARAM lparam) // first find an existing breakpoint at this address device_debug::breakpoint *bp = debug->breakpoint_first(); - while ((bp != NULL) && (bp->address() != address)) + while ((bp != nullptr) && (bp->address() != address)) bp = bp->next(); // if it doesn't exist, add a new one - if (bp != NULL) + if (bp != nullptr) { if (!is_main_console()) { diff --git a/src/osd/modules/debugger/win/logwininfo.cpp b/src/osd/modules/debugger/win/logwininfo.cpp index 6610e8a296f..2f631e199d3 100644 --- a/src/osd/modules/debugger/win/logwininfo.cpp +++ b/src/osd/modules/debugger/win/logwininfo.cpp @@ -12,13 +12,13 @@ logwin_info::logwin_info(debugger_windows_interface &debugger) : - debugwin_info(debugger, false, std::string("Errorlog: ").append(debugger.machine().system().description).append(" [").append(debugger.machine().system().name).append("]").c_str(), NULL) + debugwin_info(debugger, false, std::string("Errorlog: ").append(debugger.machine().system().description).append(" [").append(debugger.machine().system().name).append("]").c_str(), nullptr) { if (!window()) return; m_views[0].reset(global_alloc(debugview_info(debugger, *this, window(), DVT_LOG))); - if ((m_views[0] == NULL) || !m_views[0]->is_valid()) + if ((m_views[0] == nullptr) || !m_views[0]->is_valid()) { m_views[0].reset(); return; diff --git a/src/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp index 85334fd8ddc..75218574aff 100644 --- a/src/osd/modules/lib/osdlib_win32.cpp +++ b/src/osd/modules/lib/osdlib_win32.cpp @@ -77,7 +77,7 @@ int osd_setenv(const char *name, const char *value, int overwrite) if (!overwrite) { - if (osd_getenv(name) != NULL) + if (osd_getenv(name) != nullptr) return 0; } buf = (char *) osd_malloc_array(strlen(name)+strlen(value)+2); @@ -217,7 +217,7 @@ void osd_free(void *ptr) void *osd_alloc_executable(size_t size) { - return VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); + return VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); } diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index ddbc8c974d4..c3501ec84b6 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -200,7 +200,7 @@ public: // this INTERFACE but part of the osd IMPLEMENTATION // getters - running_machine &machine() { assert(m_machine != NULL); return *m_machine; } + running_machine &machine() { assert(m_machine != nullptr); return *m_machine; } virtual void debugger_update(); diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp index dd75d58ff17..9aa02c63c5b 100644 --- a/src/osd/modules/midi/portmidi.cpp +++ b/src/osd/modules/midi/portmidi.cpp @@ -46,7 +46,7 @@ static const int RX_EVENT_BUF_SIZE = 512; class osd_midi_device_pm : public osd_midi_device { public: - osd_midi_device_pm(): pmStream(NULL), xmit_cnt(0), last_status(0), rx_sysex(false) { } + osd_midi_device_pm(): pmStream(nullptr), xmit_cnt(0), last_status(0), rx_sysex(false) { } virtual ~osd_midi_device_pm() { } virtual bool open_input(const char *devname); virtual bool open_output(const char *devname); @@ -147,7 +147,7 @@ bool osd_midi_device_pm::open_input(const char *devname) if (found_dev >= 0) { - if (Pm_OpenInput(&stm, found_dev, NULL, RX_EVENT_BUF_SIZE, NULL, NULL) == pmNoError) + if (Pm_OpenInput(&stm, found_dev, nullptr, RX_EVENT_BUF_SIZE, nullptr, nullptr) == pmNoError) { pmStream = stm; return true; @@ -194,7 +194,7 @@ bool osd_midi_device_pm::open_output(const char *devname) if (found_dev >= 0) { - if (Pm_OpenOutput(&stm, found_dev, NULL, 100, NULL, NULL, 0) == pmNoError) + if (Pm_OpenOutput(&stm, found_dev, nullptr, 100, nullptr, nullptr, 0) == pmNoError) { pmStream = stm; return true; diff --git a/src/osd/modules/osdmodule.cpp b/src/osd/modules/osdmodule.cpp index e0d7781ace0..1c745effc6c 100644 --- a/src/osd/modules/osdmodule.cpp +++ b/src/osd/modules/osdmodule.cpp @@ -11,13 +11,13 @@ osd_module_manager::osd_module_manager() { for (int i=0; i~osd_module(); osd_free(m_modules[i]); @@ -32,7 +32,7 @@ void osd_module_manager::register_module(const module_type &mod_type) osd_printf_verbose("===> registered module %s %s\n", module->name(), module->type()); int i; - for (i = 0; m_modules[i] != NULL; i++) + for (i = 0; m_modules[i] != nullptr; i++) ; m_modules[i] = module; } @@ -55,7 +55,7 @@ osd_module *osd_module_manager::get_module_generic(const char *type, const char if (i>=0) return m_modules[i]; else - return NULL; + return nullptr; } osd_module *osd_module_manager::select_module(const char *type, const char *name) @@ -64,7 +64,7 @@ osd_module *osd_module_manager::select_module(const char *type, const char *name // FIXME: check if already exists! int i; - for (i = 0; m_selected[i] != NULL; i++) + for (i = 0; m_selected[i] != nullptr; i++) ; m_selected[i] = m; return m; @@ -72,7 +72,7 @@ osd_module *osd_module_manager::select_module(const char *type, const char *name void osd_module_manager::init(const osd_options &options) { - for (int i = 0; m_selected[i] != NULL; i++) + for (int i = 0; m_selected[i] != nullptr; i++) { m_selected[i]->init(options); } @@ -82,18 +82,18 @@ void osd_module_manager::exit() { // Find count int cnt; - for (cnt = 0; m_selected[cnt] != NULL; cnt++) + for (cnt = 0; m_selected[cnt] != nullptr; cnt++) ; for (int i = cnt - 1; i >= 0; i--) { m_selected[i]->exit(); - m_selected[i] = NULL; + m_selected[i] = nullptr; } } int osd_module_manager::get_module_index(const char *type, const char *name) { - for (int i = 0; m_modules[i] != NULL; i++) + for (int i = 0; m_modules[i] != nullptr; i++) { if (strcmp(m_modules[i]->type(), type) == 0 && ((name[0] == 0) || (strcmp(name, m_modules[i]->name())==0))) return i; @@ -104,7 +104,7 @@ int osd_module_manager::get_module_index(const char *type, const char *name) void osd_module_manager::get_module_names(const char *type, const int max, int *num, const char *names[]) { *num = 0; - for (int i = 0; m_modules[i] != NULL; i++) + for (int i = 0; m_modules[i] != nullptr; i++) { if ((strcmp(m_modules[i]->type(), type) == 0) && (*num < max)) { diff --git a/src/osd/modules/render/d3d/d3d9intf.cpp b/src/osd/modules/render/d3d/d3d9intf.cpp index d6751b6ca21..cb8eb741f65 100644 --- a/src/osd/modules/render/d3d/d3d9intf.cpp +++ b/src/osd/modules/render/d3d/d3d9intf.cpp @@ -70,32 +70,32 @@ base *drawd3d9_init(void) // dynamically grab the create function from d3d9.dll HINSTANCE dllhandle = LoadLibrary(TEXT("d3d9.dll")); - if (dllhandle == NULL) + if (dllhandle == nullptr) { osd_printf_verbose("Direct3D: Unable to access d3d9.dll\n"); - return NULL; + return nullptr; } // import the create function direct3dcreate9_ptr direct3dcreate9 = (direct3dcreate9_ptr)GetProcAddress(dllhandle, "Direct3DCreate9"); - if (direct3dcreate9 == NULL) + if (direct3dcreate9 == nullptr) { osd_printf_verbose("Direct3D: Unable to find Direct3DCreate9\n"); FreeLibrary(dllhandle); - return NULL; + return nullptr; } // create our core direct 3d object IDirect3D9 *d3d9 = (*direct3dcreate9)(D3D_SDK_VERSION); - if (d3d9 == NULL) + if (d3d9 == nullptr) { osd_printf_verbose("Direct3D: Error attempting to initialize Direct3D9\n"); FreeLibrary(dllhandle); - return NULL; + return nullptr; } // dynamically grab the shader load function from d3dx9.dll - HINSTANCE fxhandle = NULL; + HINSTANCE fxhandle = nullptr; for (int idx = 99; idx >= 0; idx--) // a shameful moogle { #ifdef UNICODE @@ -107,19 +107,19 @@ base *drawd3d9_init(void) sprintf(dllbuf, "d3dx9_%d.dll", idx); fxhandle = LoadLibraryA(dllbuf); #endif - if (fxhandle != NULL) + if (fxhandle != nullptr) { break; } } - if (fxhandle == NULL) + if (fxhandle == nullptr) { osd_printf_verbose("Direct3D: Warning - Unable find any D3D9 DLLs; disabling post-effect rendering\n"); post_available = false; } // allocate an object to hold our data - base *d3dptr = global_alloc(base); + auto d3dptr = global_alloc(base); d3dptr->version = 9; d3dptr->d3dobj = d3d9; d3dptr->dllhandle = dllhandle; @@ -284,20 +284,20 @@ static HRESULT device_clear(device *dev, DWORD count, const D3DRECT *rects, DWOR static HRESULT device_create_offscreen_plain_surface(device *dev, UINT width, UINT height, D3DFORMAT format, D3DPOOL pool, surface **surface) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; - return IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, pool, (IDirect3DSurface9 **)surface, NULL); + return IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, pool, (IDirect3DSurface9 **)surface, nullptr); } static HRESULT device_create_texture(device *dev, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool, texture **texture) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; - return IDirect3DDevice9_CreateTexture(device, width, height, levels, usage, format, pool, (IDirect3DTexture9 **)texture, NULL); + return IDirect3DDevice9_CreateTexture(device, width, height, levels, usage, format, pool, (IDirect3DTexture9 **)texture, nullptr); } static HRESULT device_create_vertex_buffer(device *dev, UINT length, DWORD usage, DWORD fvf, D3DPOOL pool, vertex_buffer **buf) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; - return IDirect3DDevice9_CreateVertexBuffer(device, length, usage, fvf, pool, (IDirect3DVertexBuffer9 **)buf, NULL); + return IDirect3DDevice9_CreateVertexBuffer(device, length, usage, fvf, pool, (IDirect3DVertexBuffer9 **)buf, nullptr); } @@ -395,7 +395,7 @@ static HRESULT device_set_render_target(device *dev, DWORD index, surface *surf) static HRESULT device_create_render_target(device *dev, UINT width, UINT height, D3DFORMAT format, surface **surface) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; - return IDirect3DDevice9_CreateRenderTarget(device, width, height, format, D3DMULTISAMPLE_NONE, 0, false, (IDirect3DSurface9 **)surface, NULL); + return IDirect3DDevice9_CreateRenderTarget(device, width, height, format, D3DMULTISAMPLE_NONE, 0, false, (IDirect3DSurface9 **)surface, nullptr); } diff --git a/src/osd/modules/sync/sync_mini.cpp b/src/osd/modules/sync/sync_mini.cpp index a09303aed80..f5e6accb0c7 100644 --- a/src/osd/modules/sync/sync_mini.cpp +++ b/src/osd/modules/sync/sync_mini.cpp @@ -82,7 +82,7 @@ void osd_lock_free(osd_lock *lock) osd_event *osd_event_alloc(int manualreset, int initialstate) { - return NULL; + return nullptr; } @@ -129,7 +129,7 @@ int osd_event_wait(osd_event *event, osd_ticks_t timeout) osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) { - return NULL; + return nullptr; } diff --git a/src/osd/modules/sync/sync_windows.cpp b/src/osd/modules/sync/sync_windows.cpp index c3d93c75fc9..9439d68b72c 100644 --- a/src/osd/modules/sync/sync_windows.cpp +++ b/src/osd/modules/sync/sync_windows.cpp @@ -68,7 +68,7 @@ struct osd_scalable_lock // GLOBAL VARIABLES //============================================================ -static try_enter_critical_section_ptr try_enter_critical_section = NULL; +static try_enter_critical_section_ptr try_enter_critical_section = nullptr; static int checked_for_try_enter = FALSE; @@ -80,8 +80,8 @@ static int checked_for_try_enter = FALSE; osd_lock *osd_lock_alloc(void) { osd_lock *lock = (osd_lock *)malloc(sizeof(*lock)); - if (lock == NULL) - return NULL; + if (lock == nullptr) + return nullptr; InitializeCriticalSection(&lock->critsect); return lock; } @@ -121,13 +121,13 @@ int osd_lock_try(osd_lock *lock) { // see if we can use TryEnterCriticalSection HMODULE library = LoadLibrary(TEXT("kernel32.dll")); - if (library != NULL) + if (library != nullptr) try_enter_critical_section = (try_enter_critical_section_ptr)GetProcAddress(library, "TryEnterCriticalSection"); checked_for_try_enter = TRUE; } // if we have it, use it, otherwise just block - if (try_enter_critical_section != NULL) + if (try_enter_critical_section != nullptr) result = (*try_enter_critical_section)(&lock->critsect); else EnterCriticalSection(&lock->critsect); @@ -203,7 +203,7 @@ INT32 win_atomic_add32(INT32 volatile *ptr, INT32 delta) osd_event *osd_event_alloc(int manualreset, int initialstate) { - return (osd_event *) CreateEvent(NULL, manualreset, initialstate, NULL); + return (osd_event *) CreateEvent(nullptr, manualreset, initialstate, nullptr); } //============================================================ @@ -271,15 +271,15 @@ osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) uintptr_t handle; thread = (osd_thread *)calloc(1, sizeof(osd_thread)); - if (thread == NULL) - return NULL; + if (thread == nullptr) + return nullptr; thread->callback = callback; thread->param = cbparam; - handle = _beginthreadex(NULL, 0, worker_thread_entry, thread, 0, NULL); + handle = _beginthreadex(nullptr, 0, worker_thread_entry, thread, 0, nullptr); if (handle == 0) { free(thread); - return NULL; + return nullptr; } thread->handle = (HANDLE) handle; return thread; @@ -327,8 +327,8 @@ osd_scalable_lock *osd_scalable_lock_alloc(void) osd_scalable_lock *lock; lock = (osd_scalable_lock *)calloc(1, sizeof(*lock)); - if (lock == NULL) - return NULL; + if (lock == nullptr) + return nullptr; memset(lock, 0, sizeof(*lock)); #if USE_SCALABLE_LOCKS diff --git a/src/osd/modules/sync/work_mini.cpp b/src/osd/modules/sync/work_mini.cpp index fd359c6ee40..3d4b10fc539 100644 --- a/src/osd/modules/sync/work_mini.cpp +++ b/src/osd/modules/sync/work_mini.cpp @@ -80,8 +80,8 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call // allocate memory to hold the result item = (osd_work_item *)malloc(sizeof(*item)); - if (item == NULL) - return NULL; + if (item == nullptr) + return nullptr; // loop over all requested items for (itemnum = 0; itemnum < numitems; itemnum++) @@ -97,7 +97,7 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call if (flags & WORK_ITEM_FLAG_AUTO_RELEASE) { free(item); - item = NULL; + item = nullptr; } return item; } diff --git a/src/osd/osdcore.cpp b/src/osd/osdcore.cpp index 82bbf1ee63b..91ba3fc4266 100644 --- a/src/osd/osdcore.cpp +++ b/src/osd/osdcore.cpp @@ -17,7 +17,7 @@ void osd_output::push(osd_output *delegate) { if (m_ptr < MAXSTACK) { - delegate->m_chain = (m_ptr >= 0 ? m_stack[m_ptr] : NULL); + delegate->m_chain = (m_ptr >= 0 ? m_stack[m_ptr] : nullptr); m_ptr++; m_stack[m_ptr] = delegate; } diff --git a/src/osd/osdmini/minidir.cpp b/src/osd/osdmini/minidir.cpp index 66b815daabb..e061b644cdf 100644 --- a/src/osd/osdmini/minidir.cpp +++ b/src/osd/osdmini/minidir.cpp @@ -17,7 +17,7 @@ osd_directory *osd_opendir(const char *dirname) { // since there are no standard C library routines for walking directories, // we always return an error here - return NULL; + return nullptr; } @@ -29,7 +29,7 @@ const osd_directory_entry *osd_readdir(osd_directory *dir) { // since there are no standard C library routines for walking directories, // we always return an error here - return NULL; + return nullptr; } diff --git a/src/osd/osdmini/minifile.cpp b/src/osd/osdmini/minifile.cpp index b55a3ad77e9..b30b566585c 100644 --- a/src/osd/osdmini/minifile.cpp +++ b/src/osd/osdmini/minifile.cpp @@ -35,7 +35,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64 // open the file fileptr = fopen(path, mode); - if (fileptr == NULL) + if (fileptr == nullptr) return FILERR_NOT_FOUND; // store the file pointer directly as an osd_file @@ -75,7 +75,7 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 length, // perform the read count = fread(buffer, 1, length, (FILE *)file); - if (actual != NULL) + if (actual != nullptr) *actual = count; return FILERR_NONE; @@ -95,7 +95,7 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l // perform the write count = fwrite(buffer, 1, length, (FILE *)file); - if (actual != NULL) + if (actual != nullptr) *actual = count; return FILERR_NONE; @@ -169,7 +169,7 @@ int osd_uchar_from_osdchar(UINT32 /* unicode_char */ *uchar, const char *osdchar osd_directory_entry *osd_stat(const char *path) { - osd_directory_entry *result = NULL; + osd_directory_entry *result = nullptr; // create an osd_directory_entry; be sure to make sure that the caller can // free all resources by just freeing the resulting osd_directory_entry @@ -180,7 +180,7 @@ osd_directory_entry *osd_stat(const char *path) result->size = 0; FILE *f = fopen(path, "rb"); - if (f != NULL) + if (f != nullptr) { fseek(f, 0, SEEK_END); result->type = ENTTYPE_FILE; @@ -199,11 +199,11 @@ file_error osd_get_full_path(char **dst, const char *path) { // derive the full path of the file in an allocated string // for now just fake it since we don't presume any underlying file system - *dst = NULL; - if (path != NULL) + *dst = nullptr; + if (path != nullptr) { *dst = (char *)osd_malloc_array(strlen(path) + 1); - if (*dst != NULL) + if (*dst != nullptr) strcpy(*dst, path); } @@ -218,5 +218,5 @@ file_error osd_get_full_path(char **dst, const char *path) const char *osd_get_volume_name(int idx) { // we don't expose volumes - return NULL; + return nullptr; } diff --git a/src/osd/osdmini/minimain.cpp b/src/osd/osdmini/minimain.cpp index c0598e65dfd..18fbba1bc37 100644 --- a/src/osd/osdmini/minimain.cpp +++ b/src/osd/osdmini/minimain.cpp @@ -117,7 +117,7 @@ void mini_osd_interface::init(running_machine &machine) // initialize the input system by adding devices // let's pretend like we have a keyboard device keyboard_device = machine.input().device_class(DEVICE_CLASS_KEYBOARD).add_device("Keyboard"); - if (keyboard_device == NULL) + if (keyboard_device == nullptr) fatalerror("Error creating keyboard device\n"); // our faux keyboard only has a couple of keys (corresponding to the diff --git a/src/osd/osdmini/minimisc.cpp b/src/osd/osdmini/minimisc.cpp index 21d658ace5b..c6bb413b292 100644 --- a/src/osd/osdmini/minimisc.cpp +++ b/src/osd/osdmini/minimisc.cpp @@ -79,7 +79,7 @@ void osd_break_into_debugger(const char *message) char *osd_get_clipboard_text(void) { // can't support clipboards generically - return NULL; + return nullptr; } //============================================================ @@ -88,7 +88,7 @@ char *osd_get_clipboard_text(void) const char *osd_getenv(const char *name) { - return NULL; + return nullptr; } //============================================================ diff --git a/src/osd/osdnet.cpp b/src/osd/osdnet.cpp index 4c167251cea..057a562ee76 100644 --- a/src/osd/osdnet.cpp +++ b/src/osd/osdnet.cpp @@ -7,11 +7,11 @@ static class simple_list netdev_list; void add_netdev(const char *name, const char *description, create_netdev func) { - osd_netdev::entry_t *entry = global_alloc_clear(osd_netdev::entry_t); + auto entry = global_alloc_clear(osd_netdev::entry_t); entry->id = netdev_list.count(); strncpy(entry->name, name, 255); entry->name[255] = '\0'; - strncpy(entry->description, (description != NULL) ? description : "(no name)", 255); + strncpy(entry->description, (description != nullptr) ? description : "(no name)", 255); entry->description[255] = '\0'; entry->func = func; netdev_list.append(*entry); @@ -35,7 +35,7 @@ class osd_netdev *open_netdev(int id, class device_network_interface *ifdev, int entry = entry->m_next; } - return NULL; + return nullptr; } osd_netdev::osd_netdev(class device_network_interface *ifdev, int rate) diff --git a/src/osd/sdl/watchdog.cpp b/src/osd/sdl/watchdog.cpp index c3fef7a7709..01d98f460dc 100644 --- a/src/osd/sdl/watchdog.cpp +++ b/src/osd/sdl/watchdog.cpp @@ -38,7 +38,7 @@ static void *watchdog_thread(void *param) osd_process_kill(); } } - return NULL; + return nullptr; } watchdog::watchdog(void) diff --git a/src/osd/windows/ledutil.cpp b/src/osd/windows/ledutil.cpp index 6788fdaf53e..6106005145e 100644 --- a/src/osd/windows/ledutil.cpp +++ b/src/osd/windows/ledutil.cpp @@ -180,13 +180,13 @@ int main(int argc, char *argv[]) // if the argument is "-kill", post a close message if (strcmp(arg, "-kill") == 0) { - if (otherwnd != NULL) + if (otherwnd != nullptr) PostMessage(otherwnd, WM_QUIT, 0, 0); - return (otherwnd != NULL) ? 1 : 0; + return (otherwnd != nullptr) ? 1 : 0; } // if we had another instance, defer to it - if (otherwnd != NULL) + if (otherwnd != nullptr) return 0; // call the startup code @@ -205,11 +205,11 @@ int main(int argc, char *argv[]) WINDOW_STYLE, 0, 0, 1, 1, - NULL, - NULL, - GetModuleHandle(NULL), - NULL); - if (listener_hwnd == NULL) + nullptr, + nullptr, + GetModuleHandle(nullptr), + nullptr); + if (listener_hwnd == nullptr) goto error; // allocate message ids @@ -235,18 +235,18 @@ int main(int argc, char *argv[]) // see if MAME is already running otherwnd = FindWindow(OUTPUT_WINDOW_CLASS, OUTPUT_WINDOW_NAME); - if (otherwnd != NULL) + if (otherwnd != nullptr) handle_mame_start((WPARAM)otherwnd, 0); // process messages - while (GetMessage(&message, NULL, 0, 0)) + while (GetMessage(&message, nullptr, 0, 0)) { TranslateMessage(&message); DispatchMessage(&message); } // reset on the way out if still live - if (mame_target != NULL) + if (mame_target != nullptr) handle_mame_stop((WPARAM)mame_target, 0); exitcode = 0; @@ -273,7 +273,7 @@ static int create_window_class(void) // initialize the description of the window class wc.lpszClassName = WINDOW_CLASS; - wc.hInstance = GetModuleHandle(NULL); + wc.hInstance = GetModuleHandle(nullptr); wc.lpfnWndProc = listener_window_proc; // register the class; fail if we can't @@ -351,7 +351,7 @@ static LRESULT handle_mame_stop(WPARAM wparam, LPARAM lparam) return 1; // clear our target out - mame_target = NULL; + mame_target = nullptr; reset_id_to_outname_cache(); // reset the LED states @@ -379,11 +379,11 @@ static LRESULT handle_copydata(WPARAM wparam, LPARAM lparam) // allocate memory entry = (id_map_entry *)malloc(sizeof(*entry)); - if (entry == NULL) + if (entry == nullptr) return 0; string = (char *)malloc(strlen(data->string) + 1); - if (string == NULL) + if (string == nullptr) { free(entry); return 0; @@ -411,7 +411,7 @@ static LRESULT handle_copydata(WPARAM wparam, LPARAM lparam) static void reset_id_to_outname_cache(void) { // free our ID list - while (idmaplist != NULL) + while (idmaplist != nullptr) { id_map_entry *temp = idmaplist; idmaplist = temp->next; @@ -430,7 +430,7 @@ static const char *map_id_to_outname(WPARAM id) id_map_entry *entry; // see if we have an entry in our map - for (entry = idmaplist; entry != NULL; entry = entry->next) + for (entry = idmaplist; entry != nullptr; entry = entry->next) if (entry->id == id) return entry->name; @@ -438,7 +438,7 @@ static const char *map_id_to_outname(WPARAM id) SendMessage(mame_target, om_mame_get_id_string, (WPARAM)listener_hwnd, id); // now see if we have the entry in our map - for (entry = idmaplist; entry != NULL; entry = entry->next) + for (entry = idmaplist; entry != nullptr; entry = entry->next) if (entry->id == id) return entry->name; @@ -476,7 +476,7 @@ static void output_startup(const char *commandline) { // default to PS/2, override if USB is specified as a parameter ledmethod = LED_METHOD_PS2; - if (commandline != NULL && strcmp(commandline, "-usb") == 0) + if (commandline != nullptr && strcmp(commandline, "-usb") == 0) ledmethod = LED_METHOD_USB; // output the method @@ -522,7 +522,7 @@ static void output_mame_start(void) return; } - hKbdDev = CreateFile(TEXT("\\\\.\\Kbd"), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + hKbdDev = CreateFile(TEXT("\\\\.\\Kbd"), GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr); if (hKbdDev == INVALID_HANDLE_VALUE) { error_number = GetLastError(); @@ -551,7 +551,7 @@ static void output_mame_stop(void) switch (ledmethod) { case LED_METHOD_PS2: - if (!DefineDosDevice(DDD_REMOVE_DEFINITION, TEXT("Kbd"), NULL)) + if (!DefineDosDevice(DDD_REMOVE_DEFINITION, TEXT("Kbd"), nullptr)) { error_number = GetLastError(); fprintf(stderr, "Unable to close the keyboard device. (error %d)\n", error_number); @@ -632,9 +632,9 @@ static int led_get_state(void) OutputBuffer.UnitId = 0; DeviceIoControl(hKbdDev, IOCTL_KEYBOARD_QUERY_INDICATORS, - NULL, 0, + nullptr, 0, &OutputBuffer, DataLength, - &ReturnedLength, NULL); + &ReturnedLength, nullptr); // Demangle lights to match 95/98 if (OutputBuffer.LedFlags & KEYBOARD_NUM_LOCK_ON) result |= 0x1; @@ -702,8 +702,8 @@ static void led_set_state(int state) InputBuffer.LedFlags = LedFlags; DeviceIoControl(hKbdDev, IOCTL_KEYBOARD_SET_INDICATORS, &InputBuffer, DataLength, - NULL, 0, - &ReturnedLength, NULL); + nullptr, 0, + &ReturnedLength, nullptr); break; } } diff --git a/src/osd/windows/output.cpp b/src/osd/windows/output.cpp index 41f2fd26201..0419d9bc2a7 100644 --- a/src/osd/windows/output.cpp +++ b/src/osd/windows/output.cpp @@ -85,7 +85,7 @@ bool windows_osd_interface::output_init() int result; // reset globals - clientlist = NULL; + clientlist = nullptr; // create our window class result = create_window_class(); @@ -100,11 +100,11 @@ bool windows_osd_interface::output_init() WINDOW_STYLE, 0, 0, 1, 1, - NULL, - NULL, + nullptr, + nullptr, GetModuleHandleUni(), - NULL); - assert(output_hwnd != NULL); + nullptr); + assert(output_hwnd != nullptr); // set a pointer to the running machine SetWindowLongPtr(output_hwnd, GWLP_USERDATA, (LONG_PTR)&machine()); @@ -128,7 +128,7 @@ bool windows_osd_interface::output_init() PostMessage(HWND_BROADCAST, om_mame_start, (WPARAM)output_hwnd, 0); // register a notifier for output changes - output_set_notifier(NULL, notifier_callback, NULL); + output_set_notifier(nullptr, notifier_callback, nullptr); return true; } @@ -141,7 +141,7 @@ bool windows_osd_interface::output_init() void windows_osd_interface::output_exit() { // free all the clients - while (clientlist != NULL) + while (clientlist != nullptr) { registered_client *temp = clientlist; clientlist = temp->next; @@ -219,7 +219,7 @@ static LRESULT register_client(HWND hwnd, LPARAM id) // find the end of the list; if we find ourself already registered, // return 1 - for (client = &clientlist; *client != NULL; client = &(*client)->next) + for (client = &clientlist; *client != nullptr; client = &(*client)->next) if ((*client)->id == id) { (*client)->hwnd = hwnd; @@ -229,7 +229,7 @@ static LRESULT register_client(HWND hwnd, LPARAM id) // add us to the end *client = global_alloc(registered_client); - (*client)->next = NULL; + (*client)->next = nullptr; (*client)->id = id; (*client)->hwnd = hwnd; @@ -249,7 +249,7 @@ static LRESULT unregister_client(HWND hwnd, LPARAM id) int found = FALSE; // find any matching IDs in the list and remove them - for (client = &clientlist; *client != NULL; client = &(*client)->next) + for (client = &clientlist; *client != nullptr; client = &(*client)->next) if ((*client)->id == id) { registered_client *temp = *client; @@ -281,7 +281,7 @@ static LRESULT send_id_string(running_machine &machine, HWND hwnd, LPARAM id) name = output_id_to_name(id); // a NULL name is an empty string - if (name == NULL) + if (name == nullptr) name = ""; // allocate memory for the message @@ -310,7 +310,7 @@ static void notifier_callback(const char *outname, INT32 value, void *param) registered_client *client; // loop over clients and notify them - for (client = clientlist; client != NULL; client = client->next) - if (param == NULL || param == client) + for (client = clientlist; client != nullptr; client = client->next) + if (param == nullptr || param == client) PostMessage(client->hwnd, om_mame_update_state, output_name_to_id(outname), value); } diff --git a/src/osd/windows/winsocket.cpp b/src/osd/windows/winsocket.cpp index 78c3a6161d4..cfa22dbbcb1 100644 --- a/src/osd/windows/winsocket.cpp +++ b/src/osd/windows/winsocket.cpp @@ -59,7 +59,7 @@ bool win_check_socket_path(const char *path) { if (strlen(winfile_socket_identifier) > 0 && strncmp(path, winfile_socket_identifier, strlen(winfile_socket_identifier)) == 0 && - strchr(path, ':') != NULL) return true; + strchr(path, ':') != nullptr) return true; return false; } @@ -105,7 +105,7 @@ file_error win_open_socket(const char *path, UINT32 openflags, osd_file **file, } // mark socket as "listening" - (*file)->handle = 0; + (*file)->handle = nullptr; *filesize = 0; return FILERR_NONE; } @@ -131,7 +131,7 @@ file_error win_read_socket(osd_file *file, void *buffer, UINT64 offset, UINT32 c FD_SET(file->socket, &readfds); timeout.tv_sec = timeout.tv_usec = 0; - if (select(file->socket + 1, &readfds, NULL, NULL, &timeout) < 0) + if (select(file->socket + 1, &readfds, nullptr, nullptr, &timeout) < 0) { sprintf(line, "win_read_socket : %s : %d ", __FILE__, __LINE__); perror(line); @@ -148,7 +148,7 @@ file_error win_read_socket(osd_file *file, void *buffer, UINT64 offset, UINT32 c { // listening socket SOCKET AcceptSocket; - AcceptSocket = accept(file->socket, NULL, NULL); + AcceptSocket = accept(file->socket, nullptr, nullptr); if (AcceptSocket == INVALID_SOCKET) { return FILERR_FAILURE; @@ -156,7 +156,7 @@ file_error win_read_socket(osd_file *file, void *buffer, UINT64 offset, UINT32 c closesocket(file->socket); file->socket = AcceptSocket; file->handle = INVALID_HANDLE_VALUE; - if (actual != NULL ) + if (actual != nullptr ) { *actual = 0; } @@ -174,7 +174,7 @@ file_error win_read_socket(osd_file *file, void *buffer, UINT64 offset, UINT32 c return win_error_to_mame_file_error(GetLastError()); } - if (actual != NULL ) + if (actual != nullptr ) { *actual = result; } @@ -190,7 +190,7 @@ file_error win_write_socket(osd_file *file, const void *buffer, UINT64 offset, U return win_error_to_mame_file_error(GetLastError()); } - if (actual != NULL ) + if (actual != nullptr ) { *actual = result; } diff --git a/src/tools/castool.cpp b/src/tools/castool.cpp index 22564dcdf78..a6b5c190b72 100644 --- a/src/tools/castool.cpp +++ b/src/tools/castool.cpp @@ -121,7 +121,7 @@ const struct SupportedCassetteFormats formats[] = { - {NULL,NULL,NULL} + {nullptr,nullptr,nullptr} }; @@ -129,9 +129,9 @@ static const char *get_extension(const char *name) { const char *s; s = name; - if (s != NULL) + if (s != nullptr) s = strrchr(s, '.'); - return s ? s+1 : NULL; + return s ? s+1 : nullptr; } static void display_usage(void) @@ -156,7 +156,7 @@ int CLIB_DECL main(int argc, char *argv[]) { int i; int found =0; - const struct CassetteFormat * const *selected_formats = NULL; + const struct CassetteFormat * const *selected_formats = nullptr; cassette_image *cassette; FILE *f; diff --git a/src/tools/chdman.cpp b/src/tools/chdman.cpp index 3ea0a31f752..691fc71b47b 100644 --- a/src/tools/chdman.cpp +++ b/src/tools/chdman.cpp @@ -189,7 +189,7 @@ public: chd_rawfile_compressor(core_file *file, UINT64 offset = 0, UINT64 maxoffset = ~0) : m_file(file), m_offset(offset), - m_maxoffset(MIN(maxoffset, (file != NULL) ? core_fsize(file) : 0)) { } + m_maxoffset(MIN(maxoffset, (file != nullptr) ? core_fsize(file) : 0)) { } // read interface virtual UINT32 read_data(void *dest, UINT64 offset, UINT32 length) @@ -218,7 +218,7 @@ class chd_chdfile_compressor : public chd_file_compressor public: // construction/destruction chd_chdfile_compressor(chd_file &file, UINT64 offset = 0, UINT64 maxoffset = ~0) - : m_toc(NULL), + : m_toc(nullptr), m_file(file), m_offset(offset), m_maxoffset(MIN(maxoffset, file.logical_bytes())) { } @@ -289,13 +289,13 @@ class chd_cd_compressor : public chd_file_compressor public: // construction/destruction chd_cd_compressor(cdrom_toc &toc, chdcd_track_input_info &info) - : m_file(NULL), + : m_file(nullptr), m_toc(toc), m_info(info) { } ~chd_cd_compressor() { - if (m_file != NULL) + if (m_file != nullptr) core_fclose(m_file); } @@ -320,9 +320,9 @@ public: if (offset >= startoffs && offset < endoffs) { // if we don't already have this file open, open it now - if (m_file == NULL || m_lastfile.compare(m_info.track[tracknum].fname)!=0) + if (m_file == nullptr || m_lastfile.compare(m_info.track[tracknum].fname)!=0) { - if (m_file != NULL) + if (m_file != nullptr) core_fclose(m_file); m_lastfile = m_info.track[tracknum].fname; file_error filerr = core_fopen(m_lastfile.c_str(), OPEN_FLAG_READ, &m_file); @@ -764,10 +764,10 @@ static void ATTR_PRINTF(2,3) progress(bool forceit, const char *format, ...) // print_help - print help for all the commands //------------------------------------------------- -static int print_help(const char *argv0, const char *error = NULL) +static int print_help(const char *argv0, const char *error = nullptr) { // print the error message first - if (error != NULL) + if (error != nullptr) fprintf(stderr, "Error: %s\n\n", error); // print a summary of each command @@ -788,10 +788,10 @@ static int print_help(const char *argv0, const char *error = NULL) // command //------------------------------------------------- -static int print_help(const char *argv0, const command_description &desc, const char *error = NULL) +static int print_help(const char *argv0, const command_description &desc, const char *error = nullptr) { // print the error message first - if (error != NULL) + if (error != nullptr) fprintf(stderr, "Error: %s\n\n", error); // print usage for this command @@ -801,7 +801,7 @@ static int print_help(const char *argv0, const command_description &desc, const { // determine whether we are required const char *option = desc.valid_options[valid]; - if (option == NULL) + if (option == nullptr) break; bool required = (option[0] == REQUIRED[0]); if (required) @@ -813,7 +813,7 @@ static int print_help(const char *argv0, const command_description &desc, const { const option_description &odesc = s_options[optnum]; printf(" --%s", odesc.name); - if (odesc.shortname != NULL) + if (odesc.shortname != nullptr) printf(", -%s", odesc.shortname); printf("%s%s\n", odesc.description, required ? " (required)" : ""); } @@ -904,7 +904,7 @@ UINT64 parse_number(const char *string) static void guess_chs(std::string *filename, UINT64 filesize, int sectorsize, UINT32 &cylinders, UINT32 &heads, UINT32 §ors, UINT32 &bps) { // if this is a direct physical drive read, handle it specially - if (filename != NULL && osd_get_physical_drive_geometry(filename->c_str(), &cylinders, &heads, §ors, &bps)) + if (filename != nullptr && osd_get_physical_drive_geometry(filename->c_str(), &cylinders, &heads, §ors, &bps)) return; // if we have no length to work with, we can't guess @@ -941,7 +941,7 @@ static void parse_input_chd_parameters(const parameters_t ¶ms, chd_file &inp { // process input parent file std::string *input_chd_parent_str = params.find(OPTION_INPUT_PARENT); - if (input_chd_parent_str != NULL) + if (input_chd_parent_str != nullptr) { chd_error err = input_parent_chd.open(input_chd_parent_str->c_str()); if (err != CHDERR_NONE) @@ -950,9 +950,9 @@ static void parse_input_chd_parameters(const parameters_t ¶ms, chd_file &inp // process input file std::string *input_chd_str = params.find(OPTION_INPUT); - if (input_chd_str != NULL) + if (input_chd_str != nullptr) { - chd_error err = input_chd.open(input_chd_str->c_str(), writeable, input_parent_chd.opened() ? &input_parent_chd : NULL); + chd_error err = input_chd.open(input_chd_str->c_str(), writeable, input_parent_chd.opened() ? &input_parent_chd : nullptr); if (err != CHDERR_NONE) report_error(1, "Error opening CHD file (%s): %s", input_chd_str->c_str(), chd_file::error_string(err)); } @@ -974,11 +974,11 @@ static void parse_input_start_end(const parameters_t ¶ms, UINT64 logical_siz std::string *input_start_byte_str = params.find(OPTION_INPUT_START_BYTE); std::string *input_start_hunk_str = params.find(OPTION_INPUT_START_HUNK); std::string *input_start_frame_str = params.find(OPTION_INPUT_START_FRAME); - if (input_start_byte_str != NULL) + if (input_start_byte_str != nullptr) input_start = parse_number(input_start_byte_str->c_str()); - if (input_start_hunk_str != NULL) + if (input_start_hunk_str != nullptr) input_start = parse_number(input_start_hunk_str->c_str()) * hunkbytes; - if (input_start_frame_str != NULL) + if (input_start_frame_str != nullptr) input_start = parse_number(input_start_frame_str->c_str()) * framebytes; if (input_start >= input_end) report_error(1, "Input start offset greater than input file size"); @@ -988,11 +988,11 @@ static void parse_input_start_end(const parameters_t ¶ms, UINT64 logical_siz std::string *input_length_hunks_str = params.find(OPTION_INPUT_LENGTH_HUNKS); std::string *input_length_frames_str = params.find(OPTION_INPUT_LENGTH_FRAMES); UINT64 input_length = input_end; - if (input_length_bytes_str != NULL) + if (input_length_bytes_str != nullptr) input_length = parse_number(input_length_bytes_str->c_str()); - if (input_length_hunks_str != NULL) + if (input_length_hunks_str != nullptr) input_length = parse_number(input_length_hunks_str->c_str()) * hunkbytes; - if (input_length_frames_str != NULL) + if (input_length_frames_str != nullptr) input_length = parse_number(input_length_frames_str->c_str()) * framebytes; if (input_start + input_length < input_end) input_end = input_start + input_length; @@ -1007,7 +1007,7 @@ static void parse_input_start_end(const parameters_t ¶ms, UINT64 logical_siz static void check_existing_output_file(const parameters_t ¶ms, const char *filename) { - if (params.find(OPTION_OUTPUT_FORCE) == NULL) + if (params.find(OPTION_OUTPUT_FORCE) == nullptr) { core_file *file; file_error filerr = core_fopen(filename, OPEN_FLAG_READ, &file); @@ -1029,7 +1029,7 @@ static std::string *parse_output_chd_parameters(const parameters_t ¶ms, chd_ { // process output parent file std::string *output_chd_parent_str = params.find(OPTION_OUTPUT_PARENT); - if (output_chd_parent_str != NULL) + if (output_chd_parent_str != nullptr) { chd_error err = output_parent_chd.open(output_chd_parent_str->c_str()); if (err != CHDERR_NONE) @@ -1038,7 +1038,7 @@ static std::string *parse_output_chd_parameters(const parameters_t ¶ms, chd_ // process output file std::string *output_chd_str = params.find(OPTION_OUTPUT); - if (output_chd_str != NULL) + if (output_chd_str != nullptr) check_existing_output_file(params, output_chd_str->c_str()); return output_chd_str; } @@ -1052,7 +1052,7 @@ static std::string *parse_output_chd_parameters(const parameters_t ¶ms, chd_ static void parse_hunk_size(const parameters_t ¶ms, UINT32 required_granularity, UINT32 &hunk_size) { std::string *hunk_size_str = params.find(OPTION_HUNK_SIZE); - if (hunk_size_str != NULL) + if (hunk_size_str != nullptr) { hunk_size = parse_number(hunk_size_str->c_str()); if (hunk_size < 16 || hunk_size > 1024 * 1024) @@ -1072,7 +1072,7 @@ static void parse_compression(const parameters_t ¶ms, chd_codec_type compres { // see if anything was specified std::string *compression_str = params.find(OPTION_COMPRESSION); - if (compression_str == NULL) + if (compression_str == nullptr) return; // special case: 'none' @@ -1112,7 +1112,7 @@ static void parse_compression(const parameters_t ¶ms, chd_codec_type compres static void parse_numprocessors(const parameters_t ¶ms) { std::string *numprocessors_str = params.find(OPTION_NUMPROCESSORS); - if (numprocessors_str == NULL) + if (numprocessors_str == nullptr) return; int count = atoi(numprocessors_str->c_str()); @@ -1234,7 +1234,7 @@ void output_track_metadata(int mode, core_file *file, int tracknum, const cdrom_ size = 2352; break; } - bool needquote = strchr(filename, ' ') != NULL; + bool needquote = strchr(filename, ' ') != nullptr; core_fprintf(file, "%d %d %d %d %s%s%s %" I64FMT "d\n", tracknum+1, frameoffs, mode, size, needquote?"\"":"", filename, needquote?"\"":"", discoffs); } else if (mode == MODE_CUEBIN) @@ -1421,7 +1421,7 @@ static void do_info(parameters_t ¶ms) } // print compression stats if verbose - if (params.find(OPTION_VERBOSE) != NULL) + if (params.find(OPTION_VERBOSE) != nullptr) { UINT32 compression_types[10] = { 0 }; for (UINT32 hunknum = 0; hunknum < input_chd.hunk_count(); hunknum++) @@ -1528,7 +1528,7 @@ static void do_verify(parameters_t ¶ms) fprintf(stderr, " actual SHA1 = %s\n", computed_sha1.as_string(tempstr)); // fix it if requested; this also fixes the overall one so we don't need to do any more - if (params.find(OPTION_FIX) != NULL) + if (params.find(OPTION_FIX) != nullptr) { input_chd.set_raw_sha1(computed_sha1); printf("SHA-1 updated to correct value in input CHD\n"); @@ -1551,7 +1551,7 @@ static void do_verify(parameters_t ¶ms) fprintf(stderr, " actual SHA1 = %s\n", computed_overall_sha1.as_string(tempstr)); // fix it if requested - if (params.find(OPTION_FIX) != NULL) + if (params.find(OPTION_FIX) != nullptr) { input_chd.set_raw_sha1(computed_sha1); printf("SHA-1 updated to correct value in input CHD\n"); @@ -1570,9 +1570,9 @@ static void do_verify(parameters_t ¶ms) static void do_create_raw(parameters_t ¶ms) { // process input file - core_file *input_file = NULL; + core_file *input_file = nullptr; std::string *input_file_str = params.find(OPTION_INPUT); - if (input_file_str != NULL) + if (input_file_str != nullptr) { file_error filerr = core_fopen(input_file_str->c_str(), OPEN_FLAG_READ, &input_file); if (filerr != FILERR_NONE) @@ -1590,7 +1590,7 @@ static void do_create_raw(parameters_t ¶ms) // process unit size UINT32 unit_size = output_parent.opened() ? output_parent.unit_bytes() : 0; std::string *unit_size_str = params.find(OPTION_UNIT_SIZE); - if (unit_size_str != NULL) + if (unit_size_str != nullptr) { unit_size = parse_number(unit_size_str->c_str()); if (hunk_size % unit_size != 0) @@ -1626,7 +1626,7 @@ static void do_create_raw(parameters_t ¶ms) printf("Logical size: %s\n", big_int_string(tempstr, input_end - input_start)); // catch errors so we can close & delete the output file - chd_rawfile_compressor *chd = NULL; + chd_rawfile_compressor *chd = nullptr; try { // create the new CHD @@ -1652,7 +1652,7 @@ static void do_create_raw(parameters_t ¶ms) delete chd; // delete the output file std::string *output_chd_str = params.find(OPTION_OUTPUT); - if (output_chd_str != NULL) + if (output_chd_str != nullptr) osd_rmfile(output_chd_str->c_str()); throw; } @@ -1667,9 +1667,9 @@ static void do_create_raw(parameters_t ¶ms) static void do_create_hd(parameters_t ¶ms) { // process input file - core_file *input_file = NULL; + core_file *input_file = nullptr; std::string *input_file_str = params.find(OPTION_INPUT); - if (input_file_str != NULL) + if (input_file_str != nullptr) { file_error filerr = core_fopen(input_file_str->c_str(), OPEN_FLAG_READ, &input_file); if (filerr != FILERR_NONE) @@ -1683,7 +1683,7 @@ static void do_create_hd(parameters_t ¶ms) // process sectorsize UINT32 sector_size = output_parent.opened() ? output_parent.unit_bytes() : IDE_SECTOR_SIZE; std::string *sectorsize_str = params.find(OPTION_SECTOR_SIZE); - if (sectorsize_str != NULL) + if (sectorsize_str != nullptr) { if (output_parent.opened()) report_error(1, "Sector size does not apply when creating a diff from the parent"); @@ -1698,7 +1698,7 @@ static void do_create_hd(parameters_t ¶ms) UINT64 filesize = 0; UINT64 input_start = 0; UINT64 input_end = 0; - if (input_file != NULL) + if (input_file != nullptr) { parse_input_start_end(params, core_fsize(input_file), hunk_size, hunk_size, input_start, input_end); filesize = input_end - input_start; @@ -1706,7 +1706,7 @@ static void do_create_hd(parameters_t ¶ms) else { std::string *size_str = params.find(OPTION_SIZE); - if (size_str != NULL) + if (size_str != nullptr) { if (sscanf(size_str->c_str(), "%" I64FMT"d", &filesize) != 1) report_error(1, "Invalid size string"); @@ -1716,10 +1716,10 @@ static void do_create_hd(parameters_t ¶ms) // process compression chd_codec_type compression[4]; memcpy(compression, s_default_hd_compression, sizeof(compression)); - if (input_file == NULL) + if (input_file == nullptr) compression[0] = compression[1] = compression[2] = compression[3] = CHD_CODEC_NONE; parse_compression(params, compression); - if (input_file == NULL && compression[0] != CHD_CODEC_NONE) + if (input_file == nullptr && compression[0] != CHD_CODEC_NONE) report_error(1, "Blank hard disks must be uncompressed"); // process numprocessors @@ -1730,7 +1730,7 @@ static void do_create_hd(parameters_t ¶ms) UINT32 heads = 0; UINT32 sectors = 0; std::string *chs_str = params.find(OPTION_CHS); - if (chs_str != NULL) + if (chs_str != nullptr) { if (output_parent.opened()) report_error(1, "CHS does not apply when creating a diff from the parent"); @@ -1743,7 +1743,7 @@ static void do_create_hd(parameters_t ¶ms) if (output_parent.opened()) output_parent.read_metadata(HARD_DISK_IDENT_METADATA_TAG, 0, identdata); std::string *ident_str = params.find(OPTION_IDENT); - if (ident_str != NULL) + if (ident_str != nullptr) { // load the file file_error filerr = core_fload(ident_str->c_str(), identdata); @@ -1775,7 +1775,7 @@ static void do_create_hd(parameters_t ¶ms) // if no CHS values, try to guess them if (cylinders == 0) { - if (input_file == NULL && filesize == 0) + if (input_file == nullptr && filesize == 0) report_error(1, "Blank hard drives must specify either a length or a set of CHS values"); guess_chs(input_file_str, filesize, sector_size, cylinders, heads, sectors, sector_size); } @@ -1786,7 +1786,7 @@ static void do_create_hd(parameters_t ¶ms) printf("Output CHD: %s\n", output_chd_str->c_str()); if (output_parent.opened()) printf("Parent CHD: %s\n", params.find(OPTION_OUTPUT_PARENT)->c_str()); - if (input_file != NULL) + if (input_file != nullptr) { printf("Input file: %s\n", input_file_str->c_str()); if (input_start != 0 || input_end != core_fsize(input_file)) @@ -1804,7 +1804,7 @@ static void do_create_hd(parameters_t ¶ms) printf("Logical size: %s\n", big_int_string(tempstr, UINT64(totalsectors) * UINT64(sector_size))); // catch errors so we can close & delete the output file - chd_rawfile_compressor *chd = NULL; + chd_rawfile_compressor *chd = nullptr; try { // create the new hard drive @@ -1833,7 +1833,7 @@ static void do_create_hd(parameters_t ¶ms) } // compress it generically - if (input_file != NULL) + if (input_file != nullptr) compress_common(*chd); delete chd; } @@ -1842,7 +1842,7 @@ static void do_create_hd(parameters_t ¶ms) delete chd; // delete the output file std::string *output_chd_str = params.find(OPTION_OUTPUT); - if (output_chd_str != NULL) + if (output_chd_str != nullptr) osd_rmfile(output_chd_str->c_str()); throw; } @@ -1860,7 +1860,7 @@ static void do_create_cd(parameters_t ¶ms) chdcd_track_input_info track_info; cdrom_toc toc = { 0 }; std::string *input_file_str = params.find(OPTION_INPUT); - if (input_file_str != NULL) + if (input_file_str != nullptr) { chd_error err = chdcd_parse_toc(input_file_str->c_str(), toc, track_info); if (err != CHDERR_NONE) @@ -1907,7 +1907,7 @@ static void do_create_cd(parameters_t ¶ms) printf("Logical size: %s\n", big_int_string(tempstr, UINT64(totalsectors) * CD_FRAME_SIZE)); // catch errors so we can close & delete the output file - chd_cd_compressor *chd = NULL; + chd_cd_compressor *chd = nullptr; try { // create the new CD @@ -1934,7 +1934,7 @@ static void do_create_cd(parameters_t ¶ms) delete chd; // delete the output file std::string *output_chd_str = params.find(OPTION_OUTPUT); - if (output_chd_str != NULL) + if (output_chd_str != nullptr) osd_rmfile(output_chd_str->c_str()); throw; } @@ -1949,9 +1949,9 @@ static void do_create_cd(parameters_t ¶ms) static void do_create_ld(parameters_t ¶ms) { // process input file - avi_file *input_file = NULL; + avi_file *input_file = nullptr; std::string *input_file_str = params.find(OPTION_INPUT); - if (input_file_str != NULL) + if (input_file_str != nullptr) { avi_error avierr = avi_open(input_file_str->c_str(), &input_file); if (avierr != AVIERR_NONE) @@ -2025,7 +2025,7 @@ static void do_create_ld(parameters_t ¶ms) printf("Logical size: %s\n", big_int_string(tempstr, UINT64(input_end - input_start) * hunk_size)); // catch errors so we can close & delete the output file - chd_avi_compressor *chd = NULL; + chd_avi_compressor *chd = nullptr; try { // create the new CHD @@ -2062,7 +2062,7 @@ static void do_create_ld(parameters_t ¶ms) delete chd; // delete the output file std::string *output_chd_str = params.find(OPTION_OUTPUT); - if (output_chd_str != NULL) + if (output_chd_str != nullptr) osd_rmfile(output_chd_str->c_str()); throw; } @@ -2134,7 +2134,7 @@ static void do_copy(parameters_t ¶ms) printf("Logical size: %s\n", big_int_string(tempstr, input_end - input_start)); // catch errors so we can close & delete the output file - chd_chdfile_compressor *chd = NULL; + chd_chdfile_compressor *chd = nullptr; try { // create the new CHD @@ -2179,7 +2179,7 @@ static void do_copy(parameters_t ¶ms) if (redo_cd) { cdrom_file *cdrom = cdrom_open(&input_chd); - if (cdrom == NULL) + if (cdrom == nullptr) report_error(1, "Error upgrading CD metadata"); const cdrom_toc *toc = cdrom_get_toc(cdrom); err = cdrom_write_metadata(chd, toc); @@ -2198,7 +2198,7 @@ static void do_copy(parameters_t ¶ms) delete chd; // delete the output file std::string *output_chd_str = params.find(OPTION_OUTPUT); - if (output_chd_str != NULL) + if (output_chd_str != nullptr) osd_rmfile(output_chd_str->c_str()); throw; } @@ -2224,7 +2224,7 @@ static void do_extract_raw(parameters_t ¶ms) // verify output file doesn't exist std::string *output_file_str = params.find(OPTION_OUTPUT); - if (output_file_str != NULL) + if (output_file_str != nullptr) check_existing_output_file(params, output_file_str->c_str()); // print some info @@ -2238,7 +2238,7 @@ static void do_extract_raw(parameters_t ¶ms) } // catch errors so we can close & delete the output file - core_file *output_file = NULL; + core_file *output_file = nullptr; try { // process output file @@ -2274,7 +2274,7 @@ static void do_extract_raw(parameters_t ¶ms) catch (...) { // delete the output file - if (output_file != NULL) + if (output_file != nullptr) { core_fclose(output_file); osd_rmfile(output_file_str->c_str()); @@ -2298,13 +2298,13 @@ static void do_extract_cd(parameters_t ¶ms) // further process input file cdrom_file *cdrom = cdrom_open(&input_chd); - if (cdrom == NULL) + if (cdrom == nullptr) report_error(1, "Unable to recognize CHD file as a CD"); const cdrom_toc *toc = cdrom_get_toc(cdrom); // verify output file doesn't exist std::string *output_file_str = params.find(OPTION_OUTPUT); - if (output_file_str != NULL) + if (output_file_str != nullptr) check_existing_output_file(params, output_file_str->c_str()); // verify output BIN file doesn't exist @@ -2316,7 +2316,7 @@ static void do_extract_cd(parameters_t ¶ms) char basename[128]; strncpy(basename, default_name.c_str(), 127); default_name.append(".bin"); - if (output_bin_file_str == NULL) + if (output_bin_file_str == nullptr) output_bin_file_str = &default_name; check_existing_output_file(params, output_bin_file_str->c_str()); @@ -2327,8 +2327,8 @@ static void do_extract_cd(parameters_t ¶ms) printf("Input CHD: %s\n", params.find(OPTION_INPUT)->c_str()); // catch errors so we can close & delete the output file - core_file *output_bin_file = NULL; - core_file *output_toc_file = NULL; + core_file *output_bin_file = nullptr; + core_file *output_toc_file = nullptr; try { int mode = MODE_NORMAL; @@ -2387,7 +2387,7 @@ static void do_extract_cd(parameters_t ¶ms) if (output_bin_file) { core_fclose(output_bin_file); - output_bin_file = NULL; + output_bin_file = nullptr; } filerr = core_fopen(trackbin_name.c_str(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &output_bin_file); @@ -2474,9 +2474,9 @@ static void do_extract_cd(parameters_t ¶ms) catch (...) { // delete the output files - if (output_bin_file != NULL) + if (output_bin_file != nullptr) core_fclose(output_bin_file); - if (output_toc_file != NULL) + if (output_toc_file != nullptr) core_fclose(output_toc_file); osd_rmfile(output_bin_file_str->c_str()); osd_rmfile(output_file_str->c_str()); @@ -2551,7 +2551,7 @@ static void do_extract_ld(parameters_t ¶ms) // verify output file doesn't exist std::string *output_file_str = params.find(OPTION_OUTPUT); - if (output_file_str != NULL) + if (output_file_str != nullptr) check_existing_output_file(params, output_file_str->c_str()); // print some info @@ -2565,7 +2565,7 @@ static void do_extract_ld(parameters_t ¶ms) } // catch errors so we can close & delete the output file - avi_file *output_file = NULL; + avi_file *output_file = nullptr; try { // process output file @@ -2596,7 +2596,7 @@ static void do_extract_ld(parameters_t ¶ms) input_chd.codec_configure(CHD_CODEC_AVHUFF, AVHUFF_CODEC_DECOMPRESS_CONFIG, &avconfig); // read the hunk into the buffers - chd_error err = input_chd.read_hunk(framenum, NULL); + chd_error err = input_chd.read_hunk(framenum, nullptr); if (err != CHDERR_NONE) { UINT64 filepos = core_ftell(input_chd); @@ -2627,7 +2627,7 @@ static void do_extract_ld(parameters_t ¶ms) catch (...) { // delete the output file - if (output_file != NULL) + if (output_file != nullptr) avi_close(output_file); osd_rmfile(output_file_str->c_str()); throw; @@ -2650,7 +2650,7 @@ static void do_add_metadata(parameters_t ¶ms) // process tag chd_metadata_tag tag = CHD_MAKE_TAG('?','?','?','?'); std::string *tag_str = params.find(OPTION_TAG); - if (tag_str != NULL) + if (tag_str != nullptr) { tag_str->append(" "); tag = CHD_MAKE_TAG((*tag_str)[0], (*tag_str)[1], (*tag_str)[2], (*tag_str)[3]); @@ -2659,13 +2659,13 @@ static void do_add_metadata(parameters_t ¶ms) // process index UINT32 index = 0; std::string *index_str = params.find(OPTION_INDEX); - if (index_str != NULL) + if (index_str != nullptr) index = atoi(index_str->c_str()); // process text input std::string *text_str = params.find(OPTION_VALUE_TEXT); std::string text; - if (text_str != NULL) + if (text_str != nullptr) { text = *text_str; if (text[0] == '"' && text[text.length() - 1] == '"') @@ -2675,7 +2675,7 @@ static void do_add_metadata(parameters_t ¶ms) // process file input std::string *file_str = params.find(OPTION_VALUE_FILE); dynamic_buffer file; - if (file_str != NULL) + if (file_str != nullptr) { file_error filerr = core_fload(file_str->c_str(), file); if (filerr != FILERR_NONE) @@ -2683,14 +2683,14 @@ static void do_add_metadata(parameters_t ¶ms) } // make sure we have one or the other - if (text_str == NULL && file_str == NULL) + if (text_str == nullptr && file_str == nullptr) report_error(1, "Error: missing either --valuetext/-vt or --valuefile/-vf parameters"); - if (text_str != NULL && file_str != NULL) + if (text_str != nullptr && file_str != nullptr) report_error(1, "Error: both --valuetext/-vt or --valuefile/-vf parameters specified; only one permitted"); // process no checksum UINT8 flags = CHD_MDFLAGS_CHECKSUM; - if (params.find(OPTION_NO_CHECKSUM) != NULL) + if (params.find(OPTION_NO_CHECKSUM) != nullptr) flags &= ~CHD_MDFLAGS_CHECKSUM; // print some info @@ -2698,14 +2698,14 @@ static void do_add_metadata(parameters_t ¶ms) printf("Input file: %s\n", params.find(OPTION_INPUT)->c_str()); printf("Tag: %c%c%c%c\n", (tag >> 24) & 0xff, (tag >> 16) & 0xff, (tag >> 8) & 0xff, tag & 0xff); printf("Index: %d\n", index); - if (text_str != NULL) + if (text_str != nullptr) printf("Text: %s\n", text.c_str()); else printf("Data: %s (%d bytes)\n", file_str->c_str(), int(file.size())); // write the metadata chd_error err; - if (text_str != NULL) + if (text_str != nullptr) err = input_chd.write_metadata(tag, index, text, flags); else err = input_chd.write_metadata(tag, index, &file[0], flags); @@ -2730,7 +2730,7 @@ static void do_del_metadata(parameters_t ¶ms) // process tag chd_metadata_tag tag = CHD_MAKE_TAG('?','?','?','?'); std::string *tag_str = params.find(OPTION_TAG); - if (tag_str != NULL) + if (tag_str != nullptr) { tag_str->append(" "); tag = CHD_MAKE_TAG((*tag_str)[0], (*tag_str)[1], (*tag_str)[2], (*tag_str)[3]); @@ -2739,7 +2739,7 @@ static void do_del_metadata(parameters_t ¶ms) // process index UINT32 index = 0; std::string *index_str = params.find(OPTION_INDEX); - if (index_str != NULL) + if (index_str != nullptr) index = atoi(index_str->c_str()); // print some info @@ -2770,13 +2770,13 @@ static void do_dump_metadata(parameters_t ¶ms) // verify output file doesn't exist std::string *output_file_str = params.find(OPTION_OUTPUT); - if (output_file_str != NULL) + if (output_file_str != nullptr) check_existing_output_file(params, output_file_str->c_str()); // process tag chd_metadata_tag tag = CHD_MAKE_TAG('?','?','?','?'); std::string *tag_str = params.find(OPTION_TAG); - if (tag_str != NULL) + if (tag_str != nullptr) { tag_str->append(" "); tag = CHD_MAKE_TAG((*tag_str)[0], (*tag_str)[1], (*tag_str)[2], (*tag_str)[3]); @@ -2785,7 +2785,7 @@ static void do_dump_metadata(parameters_t ¶ms) // process index UINT32 index = 0; std::string *index_str = params.find(OPTION_INDEX); - if (index_str != NULL) + if (index_str != nullptr) index = atoi(index_str->c_str()); // write the metadata @@ -2795,11 +2795,11 @@ static void do_dump_metadata(parameters_t ¶ms) report_error(1, "Error reading metadata: %s", chd_file::error_string(err)); // catch errors so we can close & delete the output file - core_file *output_file = NULL; + core_file *output_file = nullptr; try { // create the file - if (output_file_str != NULL) + if (output_file_str != nullptr) { file_error filerr = core_fopen(output_file_str->c_str(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &output_file); if (filerr != FILERR_NONE) @@ -2826,7 +2826,7 @@ static void do_dump_metadata(parameters_t ¶ms) catch (...) { // delete the output file - if (output_file != NULL) + if (output_file != nullptr) core_fclose(output_file); osd_rmfile(output_file_str->c_str()); throw; @@ -2882,7 +2882,7 @@ int CLIB_DECL main(int argc, char *argv[]) { // reduce to the option name const char *validname = desc.valid_options[valid]; - if (validname == NULL) + if (validname == nullptr) break; if (*validname == REQUIRED[0]) validname++; @@ -2897,7 +2897,7 @@ int CLIB_DECL main(int argc, char *argv[]) // do we match? const option_description &odesc = s_options[optnum]; if ((arg[1] == '-' && strcmp(odesc.name, &arg[2]) == 0) || - (arg[1] != '-' && odesc.shortname != NULL && strcmp(odesc.shortname, &arg[1]) == 0)) + (arg[1] != '-' && odesc.shortname != nullptr && strcmp(odesc.shortname, &arg[1]) == 0)) { // if we need a parameter, consume it const char *param = ""; @@ -2924,9 +2924,9 @@ int CLIB_DECL main(int argc, char *argv[]) for (int valid = 0; valid < ARRAY_LENGTH(desc.valid_options); valid++) { const char *validname = desc.valid_options[valid]; - if (validname == NULL) + if (validname == nullptr) break; - if (*validname == REQUIRED[0] && parameters.find(++validname) == NULL) + if (*validname == REQUIRED[0] && parameters.find(++validname) == nullptr) return print_help(argv[0], desc, "Required parameters missing"); } 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]; diff --git a/src/tools/imgtool/charconv.cpp b/src/tools/imgtool/charconv.cpp index 39b5953d799..34a912dcb89 100644 --- a/src/tools/imgtool/charconv.cpp +++ b/src/tools/imgtool/charconv.cpp @@ -24,7 +24,7 @@ static char *utf8_from_latin1(const char *src) /* validate input */ if (!src) { - return NULL; + return nullptr; } /* allocate space for result, twice the source len to be safe */ @@ -69,7 +69,7 @@ static char *latin1_from_utf8(const char *src) /* validate input */ if (!src) { - return NULL; + return nullptr; } /* allocate space for result */ @@ -128,7 +128,7 @@ char *utf8_from_native(imgtool_charset charset, const char *src) break; default: - result = NULL; + result = nullptr; break; } return result; @@ -155,7 +155,7 @@ char *native_from_utf8(imgtool_charset charset, const char *src) break; default: - result = NULL; + result = nullptr; break; } return result; diff --git a/src/tools/imgtool/filtbas.cpp b/src/tools/imgtool/filtbas.cpp index bff1bda121e..a83d7a80108 100644 --- a/src/tools/imgtool/filtbas.cpp +++ b/src/tools/imgtool/filtbas.cpp @@ -83,15 +83,15 @@ static imgtoolerr_t basic_readfile(const basictokens *tokens, const char *token; /* open a memory stream */ - mem_stream = stream_open_mem(NULL, 0); - if (mem_stream == NULL) + mem_stream = stream_open_mem(nullptr, 0); + if (mem_stream == nullptr) { err = IMGTOOLERR_OUTOFMEMORY; goto done; } /* read actual file */ - err = imgtool_partition_read_file(partition, filename, fork, mem_stream, NULL); + err = imgtool_partition_read_file(partition, filename, fork, mem_stream, nullptr); if (err) goto done; @@ -126,7 +126,7 @@ static imgtoolerr_t basic_readfile(const basictokens *tokens, if ((b & 0x80) && (!in_string)) { - token = NULL; + token = nullptr; for (i = 0; i < tokens->num_entries; i++) { @@ -161,7 +161,7 @@ static imgtoolerr_t basic_readfile(const basictokens *tokens, } done: - if (mem_stream != NULL) + if (mem_stream != nullptr) stream_close(mem_stream); return err; } @@ -193,8 +193,8 @@ static imgtoolerr_t basic_writefile(const basictokens *tokens, UINT16 address; /* open a memory stream */ - mem_stream = stream_open_mem(NULL, 0); - if (mem_stream == NULL) + mem_stream = stream_open_mem(nullptr, 0); + if (mem_stream == nullptr) { err = IMGTOOLERR_OUTOFMEMORY; goto done; @@ -272,7 +272,7 @@ static imgtoolerr_t basic_writefile(const basictokens *tokens, /* read until end of line */ while(buf[pos] != '\0') { - token = NULL; + token = nullptr; token_shift = 0; token_value = 0; @@ -283,10 +283,10 @@ static imgtoolerr_t basic_writefile(const basictokens *tokens, } else if (!in_quotes) { - for (i = 0; (token == NULL) && (i < tokens->num_entries); i++) + for (i = 0; (token == nullptr) && (i < tokens->num_entries); i++) { token_table = &tokens->entries[i]; - for (j = 0; (token == NULL) && (j < token_table->num_tokens); j++) + for (j = 0; (token == nullptr) && (j < token_table->num_tokens); j++) { if (!strncmp(&buf[pos], token_table->tokens[j], strlen(token_table->tokens[j]))) { @@ -300,7 +300,7 @@ static imgtoolerr_t basic_writefile(const basictokens *tokens, } /* did we find a token? */ - if (token != NULL) + if (token != nullptr) { /* emit the token */ if (token_shift != 0) @@ -343,12 +343,12 @@ static imgtoolerr_t basic_writefile(const basictokens *tokens, } /* write actual file */ - err = imgtool_partition_write_file(partition, filename, fork, mem_stream, opts, NULL); + err = imgtool_partition_write_file(partition, filename, fork, mem_stream, opts, nullptr); if (err) goto done; done: - if (mem_stream != NULL) + if (mem_stream != nullptr) stream_close(mem_stream); return err; } @@ -684,7 +684,7 @@ static const char *const vzbas[] = "RESET", /* 0x82 */ "SET", /* 0x83 */ "CLS", /* 0x84 */ - NULL, /* 0x85 */ + nullptr, /* 0x85 */ "RANDOM", /* 0x86 */ "NEXT", /* 0x87 */ "DATA", /* 0x88 */ @@ -713,21 +713,21 @@ static const char *const vzbas[] = "RESUME", /* 0x9f */ "OUT", /* 0xa0 */ "IN", /* 0xa1 */ - NULL, /* 0xa2 */ - NULL, /* 0xa3 */ - NULL, /* 0xa4 */ - NULL, /* 0xa5 */ - NULL, /* 0xa6 */ - NULL, /* 0xa7 */ - NULL, /* 0xa8 */ - NULL, /* 0xa9 */ - NULL, /* 0xaa */ - NULL, /* 0xab */ - NULL, /* 0xac */ - NULL, /* 0xad */ + nullptr, /* 0xa2 */ + nullptr, /* 0xa3 */ + nullptr, /* 0xa4 */ + nullptr, /* 0xa5 */ + nullptr, /* 0xa6 */ + nullptr, /* 0xa7 */ + nullptr, /* 0xa8 */ + nullptr, /* 0xa9 */ + nullptr, /* 0xaa */ + nullptr, /* 0xab */ + nullptr, /* 0xac */ + nullptr, /* 0xad */ "(RESET)", /* 0xae */ "LPRINT", /* 0xaf */ - NULL, /* 0xb0 */ + nullptr, /* 0xb0 */ "POKE", /* 0xb1 */ "PRINT", /* 0xb2 */ "CONT", /* 0xb3 */ @@ -741,16 +741,16 @@ static const char *const vzbas[] = "NEW", /* 0xbb */ "TAB(", /* 0xbc */ "TO", /* 0xbd */ - NULL, /* 0xbe */ + nullptr, /* 0xbe */ "USING", /* 0xbf */ "VARPTR", /* 0xc0 */ "USR", /* 0xc1 */ "ERL", /* 0xc2 */ "ERR", /* 0xc3 */ "STRING$", /* 0xc4 */ - NULL, /* 0xc5 */ + nullptr, /* 0xc5 */ "POINT", /* 0xc6 */ - NULL, /* 0xc7 */ + nullptr, /* 0xc7 */ "MEM", /* 0xc8 */ "INKEY$", /* 0xc9 */ "THEN", /* 0xca */ @@ -781,15 +781,15 @@ static const char *const vzbas[] = "TAN", /* 0xe3 */ "ATN", /* 0xe4 */ "PEEK", /* 0xe5 */ - NULL, /* 0xe6 */ - NULL, /* 0xe7 */ - NULL, /* 0xe8 */ - NULL, /* 0xe9 */ - NULL, /* 0xea */ - NULL, /* 0xeb */ - NULL, /* 0xec */ - NULL, /* 0xed */ - NULL, /* 0xee */ + nullptr, /* 0xe6 */ + nullptr, /* 0xe7 */ + nullptr, /* 0xe8 */ + nullptr, /* 0xe9 */ + nullptr, /* 0xea */ + nullptr, /* 0xeb */ + nullptr, /* 0xec */ + nullptr, /* 0xed */ + nullptr, /* 0xee */ "CINT", /* 0xef */ "CSNG", /* 0xf0 */ "CDBL", /* 0xf1 */ @@ -802,11 +802,11 @@ static const char *const vzbas[] = "LEFT$", /* 0xf8 */ "RIGHT$", /* 0xf9 */ "MID$", /* 0xfa */ - NULL, /* 0xfb */ - NULL, /* 0xfc */ - NULL, /* 0xfd */ - NULL, /* 0xfe */ - NULL /* 0xff */ + nullptr, /* 0xfb */ + nullptr, /* 0xfc */ + nullptr, /* 0xfd */ + nullptr, /* 0xfe */ + nullptr /* 0xff */ }; static const char *const bml3bas_statements[] = diff --git a/src/tools/imgtool/filteoln.cpp b/src/tools/imgtool/filteoln.cpp index 30fb52ed429..457ac89aee6 100644 --- a/src/tools/imgtool/filteoln.cpp +++ b/src/tools/imgtool/filteoln.cpp @@ -58,14 +58,14 @@ static imgtoolerr_t ascii_readfile(imgtool_partition *partition, const char *fil imgtoolerr_t err; imgtool_stream *mem_stream; - mem_stream = stream_open_mem(NULL, 0); + mem_stream = stream_open_mem(nullptr, 0); if (!mem_stream) { err = IMGTOOLERR_OUTOFMEMORY; goto done; } - err = imgtool_partition_read_file(partition, filename, fork, mem_stream, NULL); + err = imgtool_partition_read_file(partition, filename, fork, mem_stream, nullptr); if (err) goto done; @@ -85,11 +85,11 @@ done: static imgtoolerr_t ascii_writefile(imgtool_partition *partition, const char *filename, const char *fork, imgtool_stream *sourcef, option_resolution *opts) { imgtoolerr_t err; - imgtool_stream *mem_stream = NULL; + imgtool_stream *mem_stream = nullptr; const char *eoln; /* create a stream */ - mem_stream = stream_open_mem(NULL, 0); + mem_stream = stream_open_mem(nullptr, 0); if (!mem_stream) { err = IMGTOOLERR_OUTOFMEMORY; @@ -103,7 +103,7 @@ static imgtoolerr_t ascii_writefile(imgtool_partition *partition, const char *fi goto done; stream_seek(mem_stream, SEEK_SET, 0); - err = imgtool_partition_write_file(partition, filename, fork, mem_stream, opts, NULL); + err = imgtool_partition_write_file(partition, filename, fork, mem_stream, opts, nullptr); if (err) goto done; diff --git a/src/tools/imgtool/filter.cpp b/src/tools/imgtool/filter.cpp index 5887d6b501d..cd90026b6f7 100644 --- a/src/tools/imgtool/filter.cpp +++ b/src/tools/imgtool/filter.cpp @@ -25,7 +25,7 @@ INT64 filter_get_info_int(filter_getinfoproc get_info, UINT32 state) void *filter_get_info_ptr(filter_getinfoproc get_info, UINT32 state) { union filterinfo info; - info.p = NULL; + info.p = nullptr; get_info(state, &info); return info.p; } @@ -33,7 +33,7 @@ void *filter_get_info_ptr(filter_getinfoproc get_info, UINT32 state) void *filter_get_info_fct(filter_getinfoproc get_info, UINT32 state) { union filterinfo info; - info.f = NULL; + info.f = nullptr; get_info(state, &info); return info.f; } @@ -41,7 +41,7 @@ void *filter_get_info_fct(filter_getinfoproc get_info, UINT32 state) const char *filter_get_info_string(filter_getinfoproc get_info, UINT32 state) { union filterinfo info; - info.s = NULL; + info.s = nullptr; get_info(state, &info); return info.s; } @@ -61,7 +61,7 @@ const filter_getinfoproc filters[] = filter_thombas128_getinfo, filter_thomcrypt_getinfo, filter_bml3bas_getinfo, - NULL + nullptr }; @@ -78,5 +78,5 @@ filter_getinfoproc filter_lookup(const char *name) return filters[i]; } - return NULL; + return nullptr; } diff --git a/src/tools/imgtool/iflopimg.cpp b/src/tools/imgtool/iflopimg.cpp index 9e8493f9477..3bf05aacd35 100644 --- a/src/tools/imgtool/iflopimg.cpp +++ b/src/tools/imgtool/iflopimg.cpp @@ -81,7 +81,7 @@ static const struct io_procs imgtool_ioprocs = static const struct io_procs imgtool_noclose_ioprocs = { - NULL, + nullptr, imgtool_floppy_seekproc, imgtool_floppy_readproc, imgtool_floppy_writeproc, @@ -118,7 +118,7 @@ static imgtoolerr_t imgtool_floppy_open_internal(imgtool_image *image, imgtool_s /* open up the floppy */ ferr = floppy_open(f, noclose ? &imgtool_noclose_ioprocs : &imgtool_ioprocs, - NULL, format, FLOPPY_FLAGS_READWRITE, &fimg->floppy); + nullptr, format, FLOPPY_FLAGS_READWRITE, &fimg->floppy); if (ferr) { err = imgtool_floppy_error(ferr); @@ -127,7 +127,7 @@ static imgtoolerr_t imgtool_floppy_open_internal(imgtool_image *image, imgtool_s if (open) { - err = open(image, NULL); + err = open(image, nullptr); if (err) return err; } @@ -171,7 +171,7 @@ static imgtoolerr_t imgtool_floppy_create(imgtool_image *image, imgtool_stream * /* do we have to do extra stuff when creating the image? */ if (create) { - err = create(image, NULL, opts); + err = create(image, nullptr, opts); if (err) goto done; } @@ -179,7 +179,7 @@ static imgtoolerr_t imgtool_floppy_create(imgtool_image *image, imgtool_stream * /* do we have to do extra stuff when opening the image? */ if (open) { - err = open(image, NULL); + err = open(image, nullptr); if (err) goto done; } @@ -269,7 +269,7 @@ static void imgtool_floppy_get_info(const imgtool_class *imgclass, UINT32 state, case IMGTOOLINFO_PTR_OPEN: info->open = imgtool_floppy_open; break; case IMGTOOLINFO_PTR_CREATE: info->create = imgtool_floppy_create; break; case IMGTOOLINFO_PTR_CLOSE: info->close = imgtool_floppy_close; break; - case IMGTOOLINFO_PTR_CREATEIMAGE_OPTGUIDE: info->createimage_optguide = format->param_guidelines ? floppy_option_guide : NULL; break; + case IMGTOOLINFO_PTR_CREATEIMAGE_OPTGUIDE: info->createimage_optguide = format->param_guidelines ? floppy_option_guide : nullptr; break; case IMGTOOLINFO_PTR_GET_SECTOR_SIZE: info->get_sector_size = imgtool_floppy_get_sector_size; break; case IMGTOOLINFO_PTR_READ_SECTOR: info->read_sector = imgtool_floppy_read_sector; break; case IMGTOOLINFO_PTR_WRITE_SECTOR: info->write_sector = imgtool_floppy_write_sector; break; diff --git a/src/tools/imgtool/imghd.cpp b/src/tools/imgtool/imghd.cpp index 8ac129751f9..b3161ae2caf 100644 --- a/src/tools/imgtool/imghd.cpp +++ b/src/tools/imgtool/imghd.cpp @@ -134,8 +134,8 @@ imgtoolerr_t imghd_open(imgtool_stream *stream, struct mess_hard_disk_file *hard chd_error chderr; imgtoolerr_t err = IMGTOOLERR_SUCCESS; - hard_disk->hard_disk = NULL; - hard_disk->chd = NULL; + hard_disk->hard_disk = nullptr; + hard_disk->chd = nullptr; chderr = hard_disk->chd->open(*stream_core_file(stream), stream_isreadonly(stream)); if (chderr) @@ -170,7 +170,7 @@ void imghd_close(struct mess_hard_disk_file *disk) if (disk->hard_disk) { hard_disk_close(disk->hard_disk); - disk->hard_disk = NULL; + disk->hard_disk = nullptr; } if (disk->stream) stream_close(disk->stream); diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp index df44a9bbff2..c2c07e4ee23 100644 --- a/src/tools/imgtool/imgtool.cpp +++ b/src/tools/imgtool/imgtool.cpp @@ -170,7 +170,7 @@ char *imgtool_basename(char *filename) // NULL begets NULL if (!filename) - return NULL; + return nullptr; // start at the end and return when we hit a slash or colon for (c = filename + strlen(filename) - 1; c >= filename; c--) @@ -240,9 +240,9 @@ void imgtool_exit(void) if (global_imgtool_library) { imgtool_library_close(global_imgtool_library); - global_imgtool_library = NULL; + global_imgtool_library = nullptr; } - global_warn = NULL; + global_warn = nullptr; } @@ -311,9 +311,9 @@ static imgtoolerr_t evaluate_module(const char *fname, const imgtool_module *module, float *result) { imgtoolerr_t err; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; - imgtool_directory *imageenum = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; + imgtool_directory *imageenum = nullptr; imgtool_dirent ent; float current_result; @@ -331,7 +331,7 @@ static imgtoolerr_t evaluate_module(const char *fname, if (err) goto done; - err = imgtool_directory_open(partition, NULL, &imageenum); + err = imgtool_directory_open(partition, nullptr, &imageenum); if (err) goto done; @@ -387,12 +387,12 @@ imgtoolerr_t imgtool_identify_file(const char *fname, imgtool_module **modules, { imgtoolerr_t err = IMGTOOLERR_SUCCESS; imgtool_library *library = global_imgtool_library; - imgtool_module *module = NULL; + imgtool_module *module = nullptr; imgtool_module *insert_module; imgtool_module *temp_module; size_t i = 0; const char *extension; - float val, temp_val, *values = NULL; + float val, temp_val, *values = nullptr; if (count <= 0) { @@ -401,7 +401,7 @@ imgtoolerr_t imgtool_identify_file(const char *fname, imgtool_module **modules, } for (i = 0; i < count; i++) - modules[i] = NULL; + modules[i] = nullptr; if (count > 1) count--; /* null terminate */ @@ -420,7 +420,7 @@ imgtoolerr_t imgtool_identify_file(const char *fname, imgtool_module **modules, extension++; /* iterate through all modules */ - while((module = imgtool_library_iterate(library, module)) != NULL) + while((module = imgtool_library_iterate(library, module)) != nullptr) { if (!extension || image_find_extension(module->extensions, extension)) { @@ -592,7 +592,7 @@ imgtoolerr_t imgtool_image_write_block(imgtool_image *image, UINT64 block, const imgtoolerr_t imgtool_image_clear_block(imgtool_image *image, UINT64 block, UINT8 data) { imgtoolerr_t err; - UINT8 *block_data = NULL; + UINT8 *block_data = nullptr; UINT32 length; err = imgtool_image_get_block_size(image, &length); @@ -666,7 +666,7 @@ const imgtool_module *imgtool_image_module(imgtool_image *img) void *imgtool_image_extra_bytes(imgtool_image *image) { - void *ptr = NULL; + void *ptr = nullptr; if (image->module->image_extra_bytes > 0) ptr = ((UINT8 *) image) + sizeof(*image); assert(ptr); @@ -699,7 +699,7 @@ UINT64 imgtool_image_rand(imgtool_image *image) static char *pool_strdup_allow_null(object_pool *pool, char *s) { - return s ? pool_strdup_lib(pool, s) : NULL; + return s ? pool_strdup_lib(pool, s) : nullptr; } @@ -707,7 +707,7 @@ static char *pool_strdup_allow_null(object_pool *pool, char *s) imgtoolerr_t imgtool_partition_open(imgtool_image *image, int partition_index, imgtool_partition **partition) { imgtoolerr_t err = (imgtoolerr_t)IMGTOOLERR_SUCCESS; - imgtool_partition *p = NULL; + imgtool_partition *p = nullptr; imgtool_class imgclass; imgtool_partition_info partition_info[32]; UINT64 base_block, block_count; @@ -753,7 +753,7 @@ imgtoolerr_t imgtool_partition_open(imgtool_image *image, int partition_index, i partition_extra_bytes = imgtool_get_info_int(&imgclass, IMGTOOLINFO_INT_PARTITION_EXTRA_BYTES); /* allocate the new memory pool */ - pool = pool_alloc_lib(NULL); + pool = pool_alloc_lib(nullptr); if (!pool) { err = (imgtoolerr_t)IMGTOOLERR_OUTOFMEMORY; @@ -806,12 +806,12 @@ imgtoolerr_t imgtool_partition_open(imgtool_image *image, int partition_index, i /* mask out if writing is untested */ if (global_omit_untested && imgtool_get_info_int(&imgclass, IMGTOOLINFO_INT_WRITING_UNTESTED)) { - p->write_file = NULL; - p->delete_file = NULL; - p->create_dir = NULL; - p->delete_dir = NULL; - p->writefile_optguide = NULL; - p->writefile_optspec = NULL; + p->write_file = nullptr; + p->delete_file = nullptr; + p->create_dir = nullptr; + p->delete_dir = nullptr; + p->writefile_optguide = nullptr; + p->writefile_optspec = nullptr; } /* call the partition open function, if present */ @@ -825,7 +825,7 @@ imgtoolerr_t imgtool_partition_open(imgtool_image *image, int partition_index, i } done: - *partition = err ? NULL : p; + *partition = err ? nullptr : p; return err; } @@ -930,18 +930,18 @@ int imgtool_validitychecks(void) int error = 0; int val; imgtoolerr_t err = (imgtoolerr_t)IMGTOOLERR_SUCCESS; - const imgtool_module *module = NULL; + const imgtool_module *module = nullptr; const option_guide *guide_entry; imgtool_module_features features; int created_library = FALSE; if (!global_imgtool_library) { - imgtool_init(FALSE, NULL); + imgtool_init(FALSE, nullptr); created_library = TRUE; } - while((module = imgtool_library_iterate(global_imgtool_library, module)) != NULL) + while((module = imgtool_library_iterate(global_imgtool_library, module)) != nullptr) { features = imgtool_get_module_features(module); @@ -1091,13 +1091,13 @@ static imgtoolerr_t internal_open(const imgtool_module *module, const char *fnam int read_or_write, option_resolution *createopts, imgtool_image **outimg) { imgtoolerr_t err; - imgtool_stream *f = NULL; - imgtool_image *image = NULL; - object_pool *pool = NULL; + imgtool_stream *f = nullptr; + imgtool_image *image = nullptr; + object_pool *pool = nullptr; size_t size; if (outimg) - *outimg = NULL; + *outimg = nullptr; /* is the requested functionality implemented? */ if ((read_or_write == OSD_FOPEN_RW_CREATE) ? !module->create : !module->open) @@ -1107,7 +1107,7 @@ static imgtoolerr_t internal_open(const imgtool_module *module, const char *fnam } /* create a memory pool */ - pool = pool_alloc_lib(NULL); + pool = pool_alloc_lib(nullptr); if (!pool) { err = (imgtoolerr_t)(IMGTOOLERR_OUTOFMEMORY); @@ -1152,7 +1152,7 @@ done: stream_close(f); if (pool) pool_free_lib(pool); - image = NULL; + image = nullptr; } if (outimg) @@ -1171,7 +1171,7 @@ done: imgtoolerr_t imgtool_image_open(const imgtool_module *module, const char *fname, int read_or_write, imgtool_image **outimg) { read_or_write = read_or_write ? OSD_FOPEN_RW : OSD_FOPEN_READ; - return internal_open(module, fname, read_or_write, NULL, outimg); + return internal_open(module, fname, read_or_write, nullptr, outimg); } @@ -1214,7 +1214,7 @@ imgtoolerr_t imgtool_image_create(const imgtool_module *module, const char *fnam option_resolution *opts, imgtool_image **image) { imgtoolerr_t err; - option_resolution *alloc_resolution = NULL; + option_resolution *alloc_resolution = nullptr; /* allocate dummy options if necessary */ if (!opts && module->createimage_optguide) @@ -1291,7 +1291,7 @@ static imgtoolerr_t cannonicalize_path(imgtool_partition *partition, UINT32 flag const char **path, char **alloc_path) { imgtoolerr_t err = (imgtoolerr_t)IMGTOOLERR_SUCCESS; - char *new_path = NULL; + char *new_path = nullptr; char path_separator, alt_path_separator; const char *s; int in_path_separator, i, j; @@ -1323,7 +1323,7 @@ static imgtoolerr_t cannonicalize_path(imgtool_partition *partition, UINT32 flag err = (imgtoolerr_t)(IMGTOOLERR_CANNOTUSEPATH | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; } - *path = NULL; /* normalize empty path */ + *path = nullptr; /* normalize empty path */ } } else @@ -1395,7 +1395,7 @@ static imgtoolerr_t cannonicalize_fork(imgtool_partition *partition, const char imgtoolerr_t imgtool_partition_get_directory_entry(imgtool_partition *partition, const char *path, int index, imgtool_dirent *ent) { imgtoolerr_t err; - imgtool_directory *imgenum = NULL; + imgtool_directory *imgenum = nullptr; if (index < 0) { @@ -1443,7 +1443,7 @@ imgtoolerr_t imgtool_partition_get_file_size(imgtool_partition *partition, const imgtool_dirent ent; const char *path; - path = NULL; /* TODO: Need to parse off the path */ + path = nullptr; /* TODO: Need to parse off the path */ *filesize = -1; memset(&ent, 0, sizeof(ent)); @@ -1484,8 +1484,8 @@ done: imgtoolerr_t imgtool_partition_list_file_attributes(imgtool_partition *partition, const char *path, UINT32 *attrs, size_t len) { imgtoolerr_t err; - char *alloc_path = NULL; - char *new_fname = NULL; + char *alloc_path = nullptr; + char *new_fname = nullptr; memset(attrs, 0, sizeof(*attrs) * len); @@ -1496,7 +1496,7 @@ imgtoolerr_t imgtool_partition_list_file_attributes(imgtool_partition *partition } new_fname = normalize_filename(partition, path); - if (new_fname == NULL) + if (new_fname == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -1514,9 +1514,9 @@ imgtoolerr_t imgtool_partition_list_file_attributes(imgtool_partition *partition goto done; done: - if (alloc_path != NULL) + if (alloc_path != nullptr) free(alloc_path); - if (new_fname != NULL) + if (new_fname != nullptr) osd_free(new_fname); return err; } @@ -1531,8 +1531,8 @@ done: imgtoolerr_t imgtool_partition_get_file_attributes(imgtool_partition *partition, const char *path, const UINT32 *attrs, imgtool_attribute *values) { imgtoolerr_t err; - char *alloc_path = NULL; - char *new_fname = NULL; + char *alloc_path = nullptr; + char *new_fname = nullptr; if (!partition->get_attrs) { @@ -1541,7 +1541,7 @@ imgtoolerr_t imgtool_partition_get_file_attributes(imgtool_partition *partition, } new_fname = normalize_filename(partition, path); - if (new_fname == NULL) + if (new_fname == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -1559,9 +1559,9 @@ imgtoolerr_t imgtool_partition_get_file_attributes(imgtool_partition *partition, goto done; done: - if (alloc_path != NULL) + if (alloc_path != nullptr) free(alloc_path); - if (new_fname != NULL) + if (new_fname != nullptr) osd_free(new_fname); return err; } @@ -1576,7 +1576,7 @@ done: imgtoolerr_t imgtool_partition_put_file_attributes(imgtool_partition *partition, const char *path, const UINT32 *attrs, const imgtool_attribute *values) { imgtoolerr_t err; - char *alloc_path = NULL; + char *alloc_path = nullptr; if (!partition->set_attrs) { @@ -1639,8 +1639,8 @@ imgtoolerr_t imgtool_partition_put_file_attribute(imgtool_partition *partition, imgtoolerr_t imgtool_partition_get_icon_info(imgtool_partition *partition, const char *path, imgtool_iconinfo *iconinfo) { imgtoolerr_t err; - char *alloc_path = NULL; - char *new_fname = NULL; + char *alloc_path = nullptr; + char *new_fname = nullptr; if (!partition->get_iconinfo) { @@ -1649,7 +1649,7 @@ imgtoolerr_t imgtool_partition_get_icon_info(imgtool_partition *partition, const } new_fname = normalize_filename(partition, path); - if (new_fname == NULL) + if (new_fname == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -1688,7 +1688,7 @@ imgtoolerr_t imgtool_partition_suggest_file_filters(imgtool_partition *partition { imgtoolerr_t err; int i, j; - char *alloc_path = NULL; + char *alloc_path = nullptr; imgtoolerr_t (*check_stream)(imgtool_stream *stream, imgtool_suggestion_viability_t *viability); size_t position; @@ -1890,7 +1890,7 @@ imgtoolerr_t imgtool_partition_get_free_space(imgtool_partition *partition, UINT imgtoolerr_t imgtool_partition_read_file(imgtool_partition *partition, const char *filename, const char *fork, imgtool_stream *destf, filter_getinfoproc filter) { imgtoolerr_t err; - char *alloc_path = NULL; + char *alloc_path = nullptr; union filterinfo u; if (!partition->read_file) @@ -1952,10 +1952,10 @@ done: imgtoolerr_t imgtool_partition_write_file(imgtool_partition *partition, const char *filename, const char *fork, imgtool_stream *sourcef, option_resolution *opts, filter_getinfoproc filter) { imgtoolerr_t err; - char *buf = NULL; + char *buf = nullptr; char *s; - option_resolution *alloc_resolution = NULL; - char *alloc_path = NULL; + option_resolution *alloc_resolution = nullptr; + char *alloc_path = nullptr; UINT64 free_space; UINT64 file_size; union filterinfo u; @@ -2073,17 +2073,17 @@ imgtoolerr_t imgtool_partition_get_file(imgtool_partition *partition, const char { imgtoolerr_t err; imgtool_stream *f; - char *new_fname = NULL; - char *alloc_dest = NULL; - const char *filter_extension = NULL; + char *new_fname = nullptr; + char *alloc_dest = nullptr; + const char *filter_extension = nullptr; if (!dest) { /* determine the filter extension, if appropriate */ - if (filter != NULL) + if (filter != nullptr) filter_extension = filter_get_info_string(filter, FILTINFO_STR_EXTENSION); - if (filter_extension != NULL) + if (filter_extension != nullptr) { alloc_dest = (char*)malloc(strlen(filename) + 1 + strlen(filter_extension) + 1); if (!alloc_dest) @@ -2109,7 +2109,7 @@ imgtoolerr_t imgtool_partition_get_file(imgtool_partition *partition, const char } new_fname = normalize_filename(partition, filename); - if (new_fname == NULL) + if (new_fname == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -2120,11 +2120,11 @@ imgtoolerr_t imgtool_partition_get_file(imgtool_partition *partition, const char goto done; done: - if (f != NULL) + if (f != nullptr) stream_close(f); - if (alloc_dest != NULL) + if (alloc_dest != nullptr) free(alloc_dest); - if (new_fname != NULL) + if (new_fname != nullptr) osd_free(new_fname); return err; } @@ -2140,9 +2140,9 @@ imgtoolerr_t imgtool_partition_put_file(imgtool_partition *partition, const char const char *source, option_resolution *opts, filter_getinfoproc filter) { imgtoolerr_t err; - imgtool_stream *f = NULL; + imgtool_stream *f = nullptr; imgtool_charset charset; - char *alloc_newfname = NULL; + char *alloc_newfname = nullptr; if (!newfname) newfname = (const char *) imgtool_basename((char *) source); @@ -2152,7 +2152,7 @@ imgtoolerr_t imgtool_partition_put_file(imgtool_partition *partition, const char { /* convert to native format */ alloc_newfname = native_from_utf8(charset, newfname); - if (alloc_newfname == NULL) + if (alloc_newfname == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_NATIVEFILE); goto done; @@ -2169,9 +2169,9 @@ imgtoolerr_t imgtool_partition_put_file(imgtool_partition *partition, const char done: /* clean up */ - if (f != NULL) + if (f != nullptr) stream_close(f); - if (alloc_newfname != NULL) + if (alloc_newfname != nullptr) osd_free(alloc_newfname); return err; } @@ -2186,8 +2186,8 @@ done: imgtoolerr_t imgtool_partition_delete_file(imgtool_partition *partition, const char *fname) { imgtoolerr_t err; - char *alloc_path = NULL; - char *new_fname = NULL; + char *alloc_path = nullptr; + char *new_fname = nullptr; if (!partition->delete_file) { @@ -2196,7 +2196,7 @@ imgtoolerr_t imgtool_partition_delete_file(imgtool_partition *partition, const c } new_fname = normalize_filename(partition, fname); - if (new_fname == NULL) + if (new_fname == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -2234,8 +2234,8 @@ done: imgtoolerr_t imgtool_partition_list_file_forks(imgtool_partition *partition, const char *path, imgtool_forkent *ents, size_t len) { imgtoolerr_t err; - char *alloc_path = NULL; - char *new_fname = NULL; + char *alloc_path = nullptr; + char *new_fname = nullptr; if (!partition->list_forks) { @@ -2244,7 +2244,7 @@ imgtoolerr_t imgtool_partition_list_file_forks(imgtool_partition *partition, con } new_fname = normalize_filename(partition, path); - if (new_fname == NULL) + if (new_fname == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -2279,8 +2279,8 @@ done: imgtoolerr_t imgtool_partition_create_directory(imgtool_partition *partition, const char *path) { imgtoolerr_t err; - char *alloc_path = NULL; - char *new_path = NULL; + char *alloc_path = nullptr; + char *new_path = nullptr; /* implemented? */ if (!partition->create_dir) @@ -2290,7 +2290,7 @@ imgtoolerr_t imgtool_partition_create_directory(imgtool_partition *partition, co } new_path = normalize_filename(partition, path); - if (new_path == NULL) + if (new_path == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -2325,8 +2325,8 @@ done: imgtoolerr_t imgtool_partition_delete_directory(imgtool_partition *partition, const char *path) { imgtoolerr_t err; - char *alloc_path = NULL; - char *new_path = NULL; + char *alloc_path = nullptr; + char *new_path = nullptr; /* implemented? */ if (!partition->delete_dir) @@ -2336,7 +2336,7 @@ imgtoolerr_t imgtool_partition_delete_directory(imgtool_partition *partition, co } new_path = normalize_filename(partition, path); - if (new_path == NULL) + if (new_path == nullptr) { err = (imgtoolerr_t)(IMGTOOLERR_BADFILENAME | IMGTOOLERR_SRC_FUNCTIONALITY); goto done; @@ -2482,7 +2482,7 @@ UINT64 imgtool_partition_get_info_int(imgtool_partition *partition, UINT32 state void *imgtool_partition_extra_bytes(imgtool_partition *partition) { - void *ptr = NULL; + void *ptr = nullptr; if (partition->partition_extra_bytes > 0) ptr = ((UINT8 *) partition) + sizeof(*partition); assert(ptr); @@ -2618,16 +2618,16 @@ const char *imgtool_partition_get_base_name(imgtool_partition *partition, const imgtoolerr_t imgtool_directory_open(imgtool_partition *partition, const char *path, imgtool_directory **outenum) { imgtoolerr_t err = (imgtoolerr_t)IMGTOOLERR_SUCCESS; - imgtool_directory *enumeration = NULL; - char *alloc_path = NULL; - char *new_path = NULL; + imgtool_directory *enumeration = nullptr; + char *alloc_path = nullptr; + char *new_path = nullptr; size_t size; /* sanity checks */ assert(partition); assert(outenum); - *outenum = NULL; + *outenum = nullptr; if (!partition->next_enum) { @@ -2663,14 +2663,14 @@ imgtoolerr_t imgtool_directory_open(imgtool_partition *partition, const char *pa } done: - if (alloc_path != NULL) + if (alloc_path != nullptr) free(alloc_path); - if (new_path != NULL) + if (new_path != nullptr) osd_free(new_path); - if (err && (enumeration != NULL)) + if (err && (enumeration != nullptr)) { free(enumeration); - enumeration = NULL; + enumeration = nullptr; } *outenum = enumeration; return err; @@ -2731,17 +2731,17 @@ imgtoolerr_t imgtool_directory_get_next(imgtool_directory *directory, imgtool_di /* don't trust the module! */ if (!partition->supports_creation_time && (ent->creation_time != 0)) { - internal_error(NULL, "next_enum() specified creation_time, which is marked as unsupported by this module"); + internal_error(nullptr, "next_enum() specified creation_time, which is marked as unsupported by this module"); return IMGTOOLERR_UNEXPECTED; } if (!partition->supports_lastmodified_time && (ent->lastmodified_time != 0)) { - internal_error(NULL, "next_enum() specified lastmodified_time, which is marked as unsupported by this module"); + internal_error(nullptr, "next_enum() specified lastmodified_time, which is marked as unsupported by this module"); return IMGTOOLERR_UNEXPECTED; } if (!partition->path_separator && ent->directory) { - internal_error(NULL, "next_enum() returned a directory, which is marked as unsupported by this module"); + internal_error(nullptr, "next_enum() returned a directory, which is marked as unsupported by this module"); return IMGTOOLERR_UNEXPECTED; } return IMGTOOLERR_SUCCESS; diff --git a/src/tools/imgtool/library.cpp b/src/tools/imgtool/library.cpp index e2ce14d4461..88c1119a85a 100644 --- a/src/tools/imgtool/library.cpp +++ b/src/tools/imgtool/library.cpp @@ -30,7 +30,7 @@ imgtool_library *imgtool_library_create(void) object_pool *pool; /* create a memory pool */ - pool = pool_alloc_lib(NULL); + pool = pool_alloc_lib(nullptr); if (!pool) goto error; @@ -48,7 +48,7 @@ imgtool_library *imgtool_library_create(void) error: if (pool) pool_free_lib(pool); - return NULL; + return nullptr; } @@ -162,12 +162,12 @@ const imgtool_module *imgtool_library_unlink(imgtool_library *library, next = m->next ? &m->next->previous : &library->last; *previous = m->next; *next = m->previous; - m->previous = NULL; - m->next = NULL; + m->previous = nullptr; + m->next = nullptr; return m; } } - return NULL; + return nullptr; } @@ -278,5 +278,5 @@ char *imgtool_library_strdup(imgtool_library *library, const char *s) char *imgtool_library_strdup_allow_null(imgtool_library *library, const char *s) { - return s ? imgtool_library_strdup(library, s) : NULL; + return s ? imgtool_library_strdup(library, s) : nullptr; } diff --git a/src/tools/imgtool/library.h b/src/tools/imgtool/library.h index 25c923c1f4d..0ea52a68e44 100644 --- a/src/tools/imgtool/library.h +++ b/src/tools/imgtool/library.h @@ -308,7 +308,7 @@ INLINE INT64 imgtool_get_info_int(const imgtool_class *imgclass, UINT32 state) INLINE void *imgtool_get_info_ptr(const imgtool_class *imgclass, UINT32 state) { union imgtoolinfo info; - info.p = NULL; + info.p = nullptr; imgclass->get_info(imgclass, state, &info); return info.p; } @@ -316,7 +316,7 @@ INLINE void *imgtool_get_info_ptr(const imgtool_class *imgclass, UINT32 state) INLINE void *imgtool_get_info_fct(const imgtool_class *imgclass, UINT32 state) { union imgtoolinfo info; - info.f = NULL; + info.f = nullptr; imgclass->get_info(imgclass, state, &info); return info.f; } @@ -324,7 +324,7 @@ INLINE void *imgtool_get_info_fct(const imgtool_class *imgclass, UINT32 state) INLINE char *imgtool_get_info_string(const imgtool_class *imgclass, UINT32 state) { union imgtoolinfo info; - info.s = NULL; + info.s = nullptr; imgclass->get_info(imgclass, state, &info); return info.s; } diff --git a/src/tools/imgtool/main.cpp b/src/tools/imgtool/main.cpp index 6825b71fa81..fb34403f51a 100644 --- a/src/tools/imgtool/main.cpp +++ b/src/tools/imgtool/main.cpp @@ -38,15 +38,15 @@ static int parse_options(int argc, char *argv[], int minunnamed, int maxunnamed, int i; int lastunnamed = 0; char *s; - char *name = NULL; - char *value = NULL; + char *name = nullptr; + char *value = nullptr; optreserr_t oerr; static char buf[256]; if (filter) - *filter = NULL; + *filter = nullptr; if (fork) - *fork = NULL; + *fork = nullptr; for (i = 0; i < argc; i++) { @@ -177,9 +177,9 @@ static int cmd_dir(const struct command *c, int argc, char *argv[]) imgtoolerr_t err; int total_count, total_size, freespace_err; UINT64 freespace; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; - imgtool_directory *imgenum = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; + imgtool_directory *imgenum = nullptr; imgtool_dirent ent; char buf[512]; char last_modified[19]; @@ -196,7 +196,7 @@ static int cmd_dir(const struct command *c, int argc, char *argv[]) if (err) goto done; - path = argc > 2 ? argv[2] : NULL; + path = argc > 2 ? argv[2] : nullptr; err = imgtool_directory_open(partition, path, &imgenum); if (err) @@ -260,7 +260,7 @@ done: if (image) imgtool_image_close(image); if (err) - reporterror(err, c, argv[0], argv[1], NULL, NULL, NULL); + reporterror(err, c, argv[0], argv[1], nullptr, nullptr, nullptr); return err ? -1 : 0; } @@ -269,8 +269,8 @@ done: static int cmd_get(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; const char *filename; char *new_filename; int unnamedargs = 0; @@ -288,11 +288,11 @@ static int cmd_get(const struct command *c, int argc, char *argv[]) filename = interpret_filename(argv[2]); - unnamedargs = parse_options(argc, argv, 3, 4, NULL, &filter, &fork); + unnamedargs = parse_options(argc, argv, 3, 4, nullptr, &filter, &fork); if (unnamedargs < 0) goto done; - new_filename = (unnamedargs == 4) ? argv[3] : NULL; + new_filename = (unnamedargs == 4) ? argv[3] : nullptr; err = imgtool_partition_get_file(partition, filename, fork, new_filename, filter); if (err) @@ -302,7 +302,7 @@ static int cmd_get(const struct command *c, int argc, char *argv[]) done: if (err) - reporterror(err, c, argv[0], argv[1], argv[2], argv[3], NULL); + reporterror(err, c, argv[0], argv[1], argv[2], argv[3], nullptr); if (partition) imgtool_partition_close(partition); if (image) @@ -316,13 +316,13 @@ static int cmd_put(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err = IMGTOOLERR_SUCCESS; int i; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; - const char *filename = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; + const char *filename = nullptr; int unnamedargs; filter_getinfoproc filter; const imgtool_module *module; - option_resolution *resolution = NULL; + option_resolution *resolution = nullptr; const char *fork; const char *new_filename; char **filename_list; @@ -394,7 +394,7 @@ done: if (resolution) option_resolution_close(resolution); if (err) - reporterror(err, c, argv[0], argv[1], filename, NULL, resolution); + reporterror(err, c, argv[0], argv[1], filename, nullptr, resolution); return err ? -1 : 0; } @@ -403,13 +403,13 @@ done: static int cmd_getall(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; - imgtool_directory *imgenum = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; + imgtool_directory *imgenum = nullptr; imgtool_dirent ent; filter_getinfoproc filter; int unnamedargs; - const char *path = NULL; + const char *path = nullptr; int arg; int partition_index = 0; @@ -427,7 +427,7 @@ static int cmd_getall(const struct command *c, int argc, char *argv[]) path = argv[arg++]; } - unnamedargs = parse_options(argc, argv, arg, arg, NULL, &filter, NULL); + unnamedargs = parse_options(argc, argv, arg, arg, nullptr, &filter, nullptr); if (unnamedargs < 0) goto done; @@ -441,7 +441,7 @@ static int cmd_getall(const struct command *c, int argc, char *argv[]) { fprintf(stdout, "Retrieving %s (%u bytes)\n", ent.filename, (unsigned int) ent.filesize); - err = imgtool_partition_get_file(partition, ent.filename, NULL, NULL, filter); + err = imgtool_partition_get_file(partition, ent.filename, nullptr, nullptr, filter); if (err) goto done; } @@ -454,7 +454,7 @@ done: if (image) imgtool_image_close(image); if (err) - reporterror(err, c, argv[0], argv[1], NULL, NULL, NULL); + reporterror(err, c, argv[0], argv[1], nullptr, nullptr, nullptr); return err ? -1 : 0; } @@ -463,8 +463,8 @@ done: static int cmd_del(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; int partition_index = 0; err = imgtool_image_open_byname(argv[0], argv[1], OSD_FOPEN_RW, &image); @@ -485,7 +485,7 @@ done: if (image) imgtool_image_close(image); if (err) - reporterror(err, c, argv[0], argv[1], argv[2], NULL, NULL); + reporterror(err, c, argv[0], argv[1], argv[2], nullptr, nullptr); return err ? -1 : 0; } @@ -494,8 +494,8 @@ done: static int cmd_mkdir(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; int partition_index = 0; err = imgtool_image_open_byname(argv[0], argv[1], OSD_FOPEN_RW, &image); @@ -516,7 +516,7 @@ done: if (image) imgtool_image_close(image); if (err) - reporterror(err, c, argv[0], argv[1], argv[2], NULL, NULL); + reporterror(err, c, argv[0], argv[1], argv[2], nullptr, nullptr); return err ? -1 : 0; } @@ -525,8 +525,8 @@ done: static int cmd_rmdir(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err; - imgtool_image *image = NULL; - imgtool_partition *partition = NULL; + imgtool_image *image = nullptr; + imgtool_partition *partition = nullptr; int partition_index = 0; err = imgtool_image_open_byname(argv[0], argv[1], OSD_FOPEN_RW, &image); @@ -547,7 +547,7 @@ done: if (image) imgtool_image_close(image); if (err) - reporterror(err, c, argv[0], argv[1], argv[2], NULL, NULL); + reporterror(err, c, argv[0], argv[1], argv[2], nullptr, nullptr); return err ? -1 : 0; } @@ -571,7 +571,7 @@ static int cmd_identify(const struct command *c, int argc, char *argv[]) return 0; error: - reporterror(err, c, NULL, argv[0], NULL, NULL, 0); + reporterror(err, c, nullptr, argv[0], nullptr, nullptr, nullptr); return -1; } @@ -582,7 +582,7 @@ static int cmd_create(const struct command *c, int argc, char *argv[]) imgtoolerr_t err; int unnamedargs; const imgtool_module *module; - option_resolution *resolution = NULL; + option_resolution *resolution = nullptr; module = imgtool_find_module(argv[0]); if (!module) @@ -601,11 +601,11 @@ static int cmd_create(const struct command *c, int argc, char *argv[]) } } - unnamedargs = parse_options(argc, argv, 2, 3, resolution, NULL, NULL); + unnamedargs = parse_options(argc, argv, 2, 3, resolution, nullptr, nullptr); if (unnamedargs < 0) return -1; - err = imgtool_image_create(module, argv[1], resolution, NULL); + err = imgtool_image_create(module, argv[1], resolution, nullptr); if (err) goto error; @@ -616,7 +616,7 @@ static int cmd_create(const struct command *c, int argc, char *argv[]) error: if (resolution) option_resolution_close(resolution); - reporterror(err, c, argv[0], argv[1], NULL, NULL, 0); + reporterror(err, c, argv[0], argv[1], nullptr, nullptr, nullptr); return -1; } @@ -626,7 +626,7 @@ static int cmd_readsector(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err; imgtool_image *img; - imgtool_stream *stream = NULL; + imgtool_stream *stream = nullptr; dynamic_buffer buffer; UINT32 size, track, head, sector; @@ -663,7 +663,7 @@ done: if (stream) stream_close(stream); if (err) - reporterror(err, c, argv[0], argv[1], NULL, NULL, 0); + reporterror(err, c, argv[0], argv[1], nullptr, nullptr, nullptr); return err ? -1 : 0; } @@ -673,7 +673,7 @@ static int cmd_writesector(const struct command *c, int argc, char *argv[]) { imgtoolerr_t err; imgtool_image *img; - imgtool_stream *stream = NULL; + imgtool_stream *stream = nullptr; dynamic_buffer buffer; UINT32 size, track, head, sector; @@ -707,7 +707,7 @@ done: if (stream) stream_close(stream); if (err) - reporterror(err, c, argv[0], argv[1], NULL, NULL, 0); + reporterror(err, c, argv[0], argv[1], nullptr, nullptr, nullptr); return err ? -1 : 0; } @@ -719,7 +719,7 @@ static int cmd_listformats(const struct command *c, int argc, char *argv[]) fprintf(stdout, "Image formats supported by imgtool:\n\n"); - mod = imgtool_find_module(NULL); + mod = imgtool_find_module(nullptr); while(mod) { fprintf(stdout, " %-25s%s\n", mod->name, mod->description); @@ -865,7 +865,7 @@ static int cmd_listdriveroptions(const struct command *c, int argc, char *argv[] return 0; error: - reporterror((imgtoolerr_t)(IMGTOOLERR_MODULENOTFOUND|IMGTOOLERR_SRC_MODULE), c, argv[0], NULL, NULL, NULL, NULL); + reporterror((imgtoolerr_t)(IMGTOOLERR_MODULENOTFOUND|IMGTOOLERR_SRC_MODULE), c, argv[0], nullptr, nullptr, nullptr, nullptr); return -1; } @@ -886,8 +886,8 @@ static const struct command cmds[] = { "readsector", cmd_readsector, " ", 6, 6, 0 }, { "writesector", cmd_writesector, " ", 6, 6, 0 }, { "identify", cmd_identify, "", 1, 1 }, - { "listformats", cmd_listformats, NULL, 0, 0, 0 }, - { "listfilters", cmd_listfilters, NULL, 0, 0, 0 }, + { "listformats", cmd_listformats, nullptr, 0, 0, 0 }, + { "listfilters", cmd_listfilters, nullptr, 0, 0, 0 }, { "listdriveroptions", cmd_listdriveroptions, "", 1, 1, 0 } }; @@ -918,7 +918,7 @@ int CLIB_DECL main(int argc, char *argv[]) goto cmderror; /* initialize the imgtool core */ - imgtool_init(TRUE, NULL); + imgtool_init(TRUE, nullptr); if (c->lastargrepeats && (argc > c->maxargs)) { diff --git a/src/tools/imgtool/modules.cpp b/src/tools/imgtool/modules.cpp index 982fec1972c..72f81b862b9 100644 --- a/src/tools/imgtool/modules.cpp +++ b/src/tools/imgtool/modules.cpp @@ -60,18 +60,18 @@ imgtoolerr_t imgtool_create_cannonical_library(int omit_untested, imgtool_librar /* if we are omitting untested, go through and block out the functionality in question */ if (omit_untested) { - module = NULL; - while((module = imgtool_library_iterate(lib, module)) != NULL) + module = nullptr; + while((module = imgtool_library_iterate(lib, module)) != nullptr) { if (module->writing_untested) { - module->write_sector = NULL; + module->write_sector = nullptr; } if (module->creation_untested) { - module->create = NULL; - module->createimage_optguide = NULL; - module->createimage_optspec = NULL; + module->create = nullptr; + module->createimage_optguide = nullptr; + module->createimage_optspec = nullptr; } } } diff --git a/src/tools/imgtool/stream.cpp b/src/tools/imgtool/stream.cpp index 5c9cf4050c6..461d2fd99bd 100644 --- a/src/tools/imgtool/stream.cpp +++ b/src/tools/imgtool/stream.cpp @@ -41,9 +41,9 @@ struct imgtool_stream static imgtool_stream *stream_open_zip(const char *zipname, const char *subname, int read_or_write) { - imgtool_stream *imgfile = NULL; + imgtool_stream *imgfile = nullptr; // zip_error ziperr; - zip_file *z = NULL; + zip_file *z = nullptr; const zip_file_header *zipent; FILE *f; @@ -96,7 +96,7 @@ error: free(imgfile->u.buffer); free(imgfile); } - return NULL; + return nullptr; } @@ -105,7 +105,7 @@ imgtool_stream *stream_open(const char *fname, int read_or_write) { file_error filerr; const char *ext; - imgtool_stream *imgfile = NULL; + imgtool_stream *imgfile = nullptr; static const UINT32 write_modes[] = { OPEN_FLAG_READ, @@ -113,16 +113,16 @@ imgtool_stream *stream_open(const char *fname, int read_or_write) OPEN_FLAG_READ | OPEN_FLAG_WRITE, OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE }; - core_file *f = NULL; - char *buf = NULL; + core_file *f = nullptr; + char *buf = nullptr; int len, i; - imgtool_stream *s = NULL; + imgtool_stream *s = nullptr; char c; /* maybe we are just a ZIP? */ ext = strrchr(fname, '.'); if (ext && !core_stricmp(ext, ".zip")) - return stream_open_zip(fname, NULL, read_or_write); + return stream_open_zip(fname, nullptr, read_or_write); filerr = core_fopen(fname, write_modes[read_or_write], &f); if (filerr != FILERR_NONE) @@ -148,7 +148,7 @@ imgtool_stream *stream_open(const char *fname, int read_or_write) } } free(buf); - buf = NULL; + buf = nullptr; if (s) return s; @@ -173,13 +173,13 @@ imgtool_stream *stream_open(const char *fname, int read_or_write) return imgfile; error: - if (imgfile != NULL) + if (imgfile != nullptr) free((void *) imgfile); - if (f != NULL) + if (f != nullptr) core_fclose(f); if (buf) free(buf); - return (imgtool_stream *) NULL; + return (imgtool_stream *) nullptr; } @@ -190,7 +190,7 @@ imgtool_stream *stream_open_write_stream(int size) imgfile = (imgtool_stream *)malloc(sizeof(imgtool_stream)); if (!imgfile) - return NULL; + return nullptr; imgfile->imgtype = IMG_MEM; imgfile->write_protect = 0; @@ -201,7 +201,7 @@ imgtool_stream *stream_open_write_stream(int size) if (!imgfile->u.buffer) { free(imgfile); - return NULL; + return nullptr; } return imgfile; @@ -215,7 +215,7 @@ imgtool_stream *stream_open_mem(void *buf, size_t sz) imgfile = (imgtool_stream *)malloc(sizeof(imgtool_stream)); if (!imgfile) - return NULL; + return nullptr; memset(imgfile, 0, sizeof(*imgfile)); imgfile->imgtype = IMG_MEM; @@ -231,23 +231,23 @@ imgtool_stream *stream_open_mem(void *buf, size_t sz) void stream_close(imgtool_stream *s) { - assert(s != NULL); + assert(s != nullptr); switch(s->imgtype) { case IMG_FILE: - if (s->u.file != NULL) + if (s->u.file != nullptr) { core_fclose(s->u.file); - s->u.file = NULL; + s->u.file = nullptr; } break; case IMG_MEM: - if (s->u.buffer != NULL) + if (s->u.buffer != nullptr) { free(s->u.buffer); - s->u.buffer = NULL; + s->u.buffer = nullptr; } break; @@ -262,7 +262,7 @@ void stream_close(imgtool_stream *s) core_file *stream_core_file(imgtool_stream *stream) { - return (stream->imgtype == IMG_FILE) ? stream->u.file : NULL; + return (stream->imgtype == IMG_FILE) ? stream->u.file : nullptr; } @@ -369,7 +369,7 @@ void *stream_getptr(imgtool_stream *f) break; default: - ptr = NULL; + ptr = nullptr; break; } return ptr; diff --git a/src/tools/jedutil.cpp b/src/tools/jedutil.cpp index 7e4fe826c8a..284b77ae217 100644 --- a/src/tools/jedutil.cpp +++ b/src/tools/jedutil.cpp @@ -1875,93 +1875,93 @@ static pal_data paldata[] = { pal10l8pinfusecolumns, ARRAY_LENGTH(pal10l8pinfusecolumns), print_pal10l8_product_terms, config_pal10l8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL10H8", 320, pal10h8pinfuserows, ARRAY_LENGTH(pal10h8pinfuserows), pal10h8pinfusecolumns, ARRAY_LENGTH(pal10h8pinfusecolumns), print_pal10h8_product_terms, config_pal10h8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL12H6", 384, pal12h6pinfuserows, ARRAY_LENGTH(pal12h6pinfuserows), pal12h6pinfusecolumns, ARRAY_LENGTH(pal12h6pinfusecolumns), print_pal12h6_product_terms, config_pal12h6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL14H4", 448, pal14h4pinfuserows, ARRAY_LENGTH(pal14h4pinfuserows), pal14h4pinfusecolumns, ARRAY_LENGTH(pal14h4pinfusecolumns), print_pal14h4_product_terms, config_pal14h4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16H2", 512, pal16h2pinfuserows, ARRAY_LENGTH(pal16h2pinfuserows), pal16h2pinfusecolumns, ARRAY_LENGTH(pal16h2pinfusecolumns), print_pal16h2_product_terms, config_pal16h2_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16C1", 512, pal16c1pinfuserows, ARRAY_LENGTH(pal16c1pinfuserows), pal16c1pinfusecolumns, ARRAY_LENGTH(pal16c1pinfusecolumns), print_pal16c1_product_terms, config_pal16c1_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL12L6", 384, pal12l6pinfuserows, ARRAY_LENGTH(pal12l6pinfuserows), pal12l6pinfusecolumns, ARRAY_LENGTH(pal12l6pinfusecolumns), print_pal12l6_product_terms, config_pal12l6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL14L4", 448, pal14l4pinfuserows, ARRAY_LENGTH(pal14l4pinfuserows), pal14l4pinfusecolumns, ARRAY_LENGTH(pal14l4pinfusecolumns), print_pal14l4_product_terms, config_pal14l4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16L2", 512, pal16l2pinfuserows, ARRAY_LENGTH(pal16l2pinfuserows), pal16l2pinfusecolumns, ARRAY_LENGTH(pal16l2pinfusecolumns), print_pal16l2_product_terms, config_pal16l2_pins, - NULL, - NULL}, + nullptr, + nullptr}, /*{"15S8", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/ {"PAL16L8", 2048, pal16l8pinfuserows, ARRAY_LENGTH(pal16l8pinfuserows), pal16l8pinfusecolumns, ARRAY_LENGTH(pal16l8pinfusecolumns), print_pal16l8_product_terms, config_pal16l8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16R4", 2048, pal16r4pinfuserows, ARRAY_LENGTH(pal16r4pinfuserows), pal16r4pinfusecolumns, ARRAY_LENGTH(pal16r4pinfusecolumns), print_pal16r4_product_terms, config_pal16r4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16R6", 2048, pal16r6pinfuserows, ARRAY_LENGTH(pal16r6pinfuserows), pal16r6pinfusecolumns, ARRAY_LENGTH(pal16r6pinfusecolumns), print_pal16r6_product_terms, config_pal16r6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16R8", 2048, pal16r8pinfuserows, ARRAY_LENGTH(pal16r8pinfuserows), pal16r8pinfusecolumns, ARRAY_LENGTH(pal16r8pinfusecolumns), print_pal16r8_product_terms, config_pal16r8_pins, - NULL, - NULL}, + nullptr, + nullptr}, /*{"PAL16RA8", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL}, {"PAL16V8R", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/ {"PALCE16V8", 2194, @@ -1969,85 +1969,85 @@ static pal_data paldata[] = { palce16v8pinfusecolumns, ARRAY_LENGTH(palce16v8pinfusecolumns), print_palce16v8_product_terms, config_palce16v8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"GAL16V8", 2194, gal16v8pinfuserows, ARRAY_LENGTH(gal16v8pinfuserows), gal16v8pinfusecolumns, ARRAY_LENGTH(gal16v8pinfusecolumns), print_gal16v8_product_terms, config_gal16v8_pins, is_gal16v8_product_term_enabled, - NULL}, + nullptr}, {"18CV8", 2696, peel18cv8pinfuserows, ARRAY_LENGTH(peel18cv8pinfuserows), peel18cv8pinfusecolumns, ARRAY_LENGTH(peel18cv8pinfusecolumns), print_peel18cv8_product_terms, config_peel18cv8_pins, - NULL, + nullptr, get_peel18cv8_pin_fuse_state}, {"GAL18V10", 3540, gal18v10pinfuserows, ARRAY_LENGTH(gal18v10pinfuserows), gal18v10pinfusecolumns, ARRAY_LENGTH(gal18v10pinfusecolumns), print_gal18v10_product_terms, config_gal18v10_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20L8", 2560, pal20l8pinfuserows, ARRAY_LENGTH(pal20l8pinfuserows), pal20l8pinfusecolumns, ARRAY_LENGTH(pal20l8pinfusecolumns), print_pal20l8_product_terms, config_pal20l8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20L10", 1600, pal20l10pinfuserows, ARRAY_LENGTH(pal20l10pinfuserows), pal20l10pinfusecolumns, ARRAY_LENGTH(pal20l10pinfusecolumns), print_pal20l10_product_terms, config_pal20l10_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20R4", 2560, pal20r4pinfuserows, ARRAY_LENGTH(pal20r4pinfuserows), pal20r4pinfusecolumns, ARRAY_LENGTH(pal20r4pinfusecolumns), print_pal20r4_product_terms, config_pal20r4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20R6", 2560, pal20r6pinfuserows, ARRAY_LENGTH(pal20r6pinfuserows), pal20r6pinfusecolumns, ARRAY_LENGTH(pal20r6pinfusecolumns), print_pal20r6_product_terms, config_pal20r6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20R8", 2560, pal20r8pinfuserows, ARRAY_LENGTH(pal20r8pinfuserows), pal20r8pinfusecolumns, ARRAY_LENGTH(pal20r8pinfusecolumns), print_pal20r8_product_terms, config_pal20r8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20X4", 1600, pal20x4pinfuserows, ARRAY_LENGTH(pal20x4pinfuserows), pal20x4pinfusecolumns, ARRAY_LENGTH(pal20x4pinfusecolumns), print_pal20x4_product_terms, config_pal20x4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20X8", 1600, pal20x8pinfuserows, ARRAY_LENGTH(pal20x8pinfuserows), pal20x8pinfusecolumns, ARRAY_LENGTH(pal20x8pinfusecolumns), print_pal20x8_product_terms, config_pal20x8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20X10", 1600, pal20x10pinfuserows, ARRAY_LENGTH(pal20x10pinfuserows), pal20x10pinfusecolumns, ARRAY_LENGTH(pal20x10pinfusecolumns), print_pal20x10_product_terms, config_pal20x10_pins, - NULL, - NULL}, + nullptr, + nullptr}, /*{"PAL22V10", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL}, {"GAL20V8A", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL}, {"GAL22V10", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL}, @@ -2057,22 +2057,22 @@ static pal_data paldata[] = { _82s153_pls153pinfusecolumns, ARRAY_LENGTH(_82s153_pls153pinfusecolumns), print_82s153_pls153_product_terms, config_82s153_pls153_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PLS153", 1842, _82s153_pls153pinfuserows, ARRAY_LENGTH(_82s153_pls153pinfuserows), _82s153_pls153pinfusecolumns, ARRAY_LENGTH(_82s153_pls153pinfusecolumns), print_82s153_pls153_product_terms, config_82s153_pls153_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"CK2605", 1106, ck2605pinfuserows, ARRAY_LENGTH(ck2605pinfuserows), ck2605pinfusecolumns, ARRAY_LENGTH(ck2605pinfusecolumns), print_ck2605_product_terms, config_ck2605_pins, - NULL, - NULL}, + nullptr, + nullptr}, #if defined(ricoh_pals) {"EPL10P8", 664, epl10p8pinfuserows, ARRAY_LENGTH(epl10p8pinfuserows), @@ -2136,141 +2136,141 @@ static pal_data paldata[] = { pal10p8pinfusecolumns, ARRAY_LENGTH(pal10p8pinfusecolumns), print_pal10p8_product_terms, config_pal10p8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL12P6", 390, pal12p6pinfuserows, ARRAY_LENGTH(pal12p6pinfuserows), pal12p6pinfusecolumns, ARRAY_LENGTH(pal12p6pinfusecolumns), print_pal12p6_product_terms, config_pal12p6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL14P4", 452, pal14p4pinfuserows, ARRAY_LENGTH(pal14p4pinfuserows), pal14p4pinfusecolumns, ARRAY_LENGTH(pal14p4pinfusecolumns), print_pal14p4_product_terms, config_pal14p4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16P2", 514, pal16p2pinfuserows, ARRAY_LENGTH(pal16p2pinfuserows), pal16p2pinfusecolumns, ARRAY_LENGTH(pal16p2pinfusecolumns), print_pal16p2_product_terms, config_pal16p2_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16P8", 2056, pal16p8pinfuserows, ARRAY_LENGTH(pal16p8pinfuserows), pal16p8pinfusecolumns, ARRAY_LENGTH(pal16p8pinfusecolumns), print_pal16p8_product_terms, config_pal16p8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16RP4", 2056, pal16rp4pinfuserows, ARRAY_LENGTH(pal16rp4pinfuserows), pal16rp4pinfusecolumns, ARRAY_LENGTH(pal16rp4pinfusecolumns), print_pal16rp4_product_terms, config_pal16rp4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16RP6", 2056, pal16rp6pinfuserows, ARRAY_LENGTH(pal16rp6pinfuserows), pal16rp6pinfusecolumns, ARRAY_LENGTH(pal16rp6pinfusecolumns), print_pal16rp6_product_terms, config_pal16rp6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16RP8", 2056, pal16rp8pinfuserows, ARRAY_LENGTH(pal16rp8pinfuserows), pal16rp8pinfusecolumns, ARRAY_LENGTH(pal16rp8pinfusecolumns), print_pal16rp8_product_terms, config_pal16rp8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL6L16", 192, pal6l16pinfuserows, ARRAY_LENGTH(pal6l16pinfuserows), pal6l16pinfusecolumns, ARRAY_LENGTH(pal6l16pinfusecolumns), print_pal6l16_product_terms, config_pal6l16_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL8L14", 224, pal8l14pinfuserows, ARRAY_LENGTH(pal8l14pinfuserows), pal8l14pinfusecolumns, ARRAY_LENGTH(pal8l14pinfusecolumns), print_pal8l14_product_terms, config_pal8l14_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL12H10", 480, pal12h10pinfuserows, ARRAY_LENGTH(pal12h10pinfuserows), pal12h10pinfusecolumns, ARRAY_LENGTH(pal12h10pinfusecolumns), print_pal12h10_product_terms, config_pal12h10_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL12L10", 480, pal12l10pinfuserows, ARRAY_LENGTH(pal12l10pinfuserows), pal12l10pinfusecolumns, ARRAY_LENGTH(pal12l10pinfusecolumns), print_pal12l10_product_terms, config_pal12l10_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL14H8", 560, pal14h8pinfuserows, ARRAY_LENGTH(pal14h8pinfuserows), pal14h8pinfusecolumns, ARRAY_LENGTH(pal14h8pinfusecolumns), print_pal14h8_product_terms, config_pal14h8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL14L8", 560, pal14l8pinfuserows, ARRAY_LENGTH(pal14l8pinfuserows), pal14l8pinfusecolumns, ARRAY_LENGTH(pal14l8pinfusecolumns), print_pal14l8_product_terms, config_pal14l8_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16H6", 640, pal16h6pinfuserows, ARRAY_LENGTH(pal16h6pinfuserows), pal16h6pinfusecolumns, ARRAY_LENGTH(pal16h6pinfusecolumns), print_pal16h6_product_terms, config_pal16h6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL16L6", 640, pal16l6pinfuserows, ARRAY_LENGTH(pal16l6pinfuserows), pal16l6pinfusecolumns, ARRAY_LENGTH(pal16l6pinfusecolumns), print_pal16l6_product_terms, config_pal16l6_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL18H4", 720, pal18h4pinfuserows, ARRAY_LENGTH(pal18h4pinfuserows), pal18h4pinfusecolumns, ARRAY_LENGTH(pal18h4pinfusecolumns), print_pal18h4_product_terms, config_pal18h4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL18L4", 720, pal18l4pinfuserows, ARRAY_LENGTH(pal18l4pinfuserows), pal18l4pinfusecolumns, ARRAY_LENGTH(pal18l4pinfusecolumns), print_pal18l4_product_terms, config_pal18l4_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20C1", 640, pal20c1pinfuserows, ARRAY_LENGTH(pal20c1pinfuserows), pal20c1pinfusecolumns, ARRAY_LENGTH(pal20c1pinfusecolumns), print_pal20c1_product_terms, config_pal20c1_pins, - NULL, - NULL}, + nullptr, + nullptr}, {"PAL20L2", 640, pal20l2pinfuserows, ARRAY_LENGTH(pal20l2pinfuserows), pal20l2pinfusecolumns, ARRAY_LENGTH(pal20l2pinfusecolumns), print_pal20l2_product_terms, config_pal20l2_pins, - NULL, - NULL}}; + nullptr, + nullptr}}; /*************************************************************************** CORE IMPLEMENTATION @@ -2333,7 +2333,7 @@ static const pal_data* find_pal_data(const char *name) } } - return NULL; + return nullptr; } @@ -2355,7 +2355,7 @@ static const pin_fuse_rows* find_fuse_rows(const pal_data* pal, UINT16 pin) } } - return NULL; + return nullptr; } @@ -2377,7 +2377,7 @@ static const pin_fuse_columns* find_fuse_columns(const pal_data* pal, UINT16 pin } } - return NULL; + return nullptr; } @@ -7054,7 +7054,7 @@ static int command_convert(int argc, char *argv[]) printf(" Total fuses = %d\n", jed.numfuses); /* generate the output */ - dstbuflen = jedbin_output(&jed, NULL, 0); + dstbuflen = jedbin_output(&jed, nullptr, 0); dstbuf = (UINT8 *)malloc(dstbuflen); if (!dstbuf) { @@ -7082,7 +7082,7 @@ static int command_convert(int argc, char *argv[]) printf(" Total fuses = %d\n", jed.numfuses); /* generate the output */ - dstbuflen = jed_output(&jed, NULL, 0); + dstbuflen = jed_output(&jed, nullptr, 0); dstbuf = (UINT8 *)malloc(dstbuflen); if (!dstbuf) { diff --git a/src/tools/ldresample.cpp b/src/tools/ldresample.cpp index d22fcd7a4a9..771c4e94676 100644 --- a/src/tools/ldresample.cpp +++ b/src/tools/ldresample.cpp @@ -248,7 +248,7 @@ static bool read_chd(chd_file &file, UINT32 field, movie_info &info, UINT32 soun file.codec_configure(CHD_CODEC_AVHUFF, AVHUFF_CODEC_DECOMPRESS_CONFIG, &avconfig); // read the field - chd_error chderr = file.read_hunk(field, NULL); + chd_error chderr = file.read_hunk(field, nullptr); return (chderr == CHDERR_NONE); } @@ -508,13 +508,13 @@ int main(int argc, char *argv[]) if (argc < 2) return usage(); const char *srcfilename = argv[1]; - const char *dstfilename = (argc < 3) ? NULL : argv[2]; + const char *dstfilename = (argc < 3) ? nullptr : argv[2]; double offset = (argc < 4) ? 0.0 : atof(argv[3]); double slope = (argc < 5) ? 1.0 : atof(argv[4]); // print basic information printf("Input file: %s\n", srcfilename); - if (dstfilename != NULL) + if (dstfilename != nullptr) { printf("Output file: %s\n", dstfilename); printf("Offset: %f\n", offset); @@ -538,7 +538,7 @@ int main(int argc, char *argv[]) printf("Total fields: %d\n", info.numfields); // if we don't have a destination file, scan for edges - if (dstfilename == NULL) + if (dstfilename == nullptr) { for (UINT32 fieldnum = 60; fieldnum < info.numfields - 60; fieldnum += 30) { @@ -554,7 +554,7 @@ int main(int argc, char *argv[]) // open the destination file chd_resample_compressor dstfile(srcfile, info, INT64(offset * 65536.0 * 256.0), INT64(slope * 65536.0 * 256.0)); err = create_chd(dstfile, dstfilename, srcfile, info); - if (dstfile == NULL) + if (dstfile == nullptr) { fprintf(stderr, "Unable to create file '%s'\n", dstfilename); return 1; 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; diff --git a/src/tools/pngcmp.cpp b/src/tools/pngcmp.cpp index 4b0974d824f..dda54ed7730 100644 --- a/src/tools/pngcmp.cpp +++ b/src/tools/pngcmp.cpp @@ -72,7 +72,7 @@ static int generate_png_diff(const std::string& imgfile1, const std::string& img bitmap_argb32 bitmap2; bitmap_argb32 finalbitmap; int width, height, maxwidth; - core_file *file = NULL; + core_file *file = nullptr; file_error filerr; png_error pngerr; int error = 100; @@ -150,8 +150,8 @@ static int generate_png_diff(const std::string& imgfile1, const std::string& img /* iterate over rows in these bitmaps */ for (y = 0; y < curheight; y++) { - UINT32 *src1 = (y < bitmap1.height()) ? &bitmap1.pix32(y) : NULL; - UINT32 *src2 = (y < bitmap2.height()) ? &bitmap2.pix32(y) : NULL; + UINT32 *src1 = (y < bitmap1.height()) ? &bitmap1.pix32(y) : nullptr; + UINT32 *src2 = (y < bitmap2.height()) ? &bitmap2.pix32(y) : nullptr; UINT32 *dst1 = &finalbitmap.pix32(y); UINT32 *dst2 = &finalbitmap.pix32(y, bitmap1.width() + BITMAP_SPACE); UINT32 *dstdiff = &finalbitmap.pix32(y, bitmap1.width() + BITMAP_SPACE + maxwidth + BITMAP_SPACE); @@ -161,9 +161,9 @@ static int generate_png_diff(const std::string& imgfile1, const std::string& img { int pix1 = -1, pix2 = -2; - if (src1 != NULL && x < bitmap1.width()) + if (src1 != nullptr && x < bitmap1.width()) pix1 = dst1[x] = src1[x]; - if (src2 != NULL && x < bitmap2.width()) + if (src2 != nullptr && x < bitmap2.width()) pix2 = dst2[x] = src2[x]; dstdiff[x] = (pix1 != pix2) ? 0xffffffff : 0xff000000; } @@ -176,7 +176,7 @@ static int generate_png_diff(const std::string& imgfile1, const std::string& img printf("Could not open %s (%d)\n", outfilename.c_str(), filerr); goto error; } - pngerr = png_write_bitmap(file, NULL, finalbitmap, 0, NULL); + pngerr = png_write_bitmap(file, nullptr, finalbitmap, 0, nullptr); core_fclose(file); if (pngerr != PNGERR_NONE) { diff --git a/src/tools/regrep.cpp b/src/tools/regrep.cpp index 8c2beddf0ed..6f5adbf8f22 100644 --- a/src/tools/regrep.cpp +++ b/src/tools/regrep.cpp @@ -287,14 +287,14 @@ static summary_file *get_file(const char *filename) summary_file *file; /* use the first two characters as a lookup */ - for (file = filehash[filename[0] & 0x7f][filename[1] & 0x7f]; file != NULL; file = file->next) + for (file = filehash[filename[0] & 0x7f][filename[1] & 0x7f]; file != nullptr; file = file->next) if (strcmp(filename, file->name) == 0) return file; /* didn't find one -- allocate */ file = (summary_file *)malloc(sizeof(*file)); - if (file == NULL) - return NULL; + if (file == nullptr) + return nullptr; memset(file, 0, sizeof(*file)); /* set the name so we find it in the future */ @@ -314,7 +314,7 @@ static summary_file *get_file(const char *filename) static int read_summary_log(const char *filename, int index) { - summary_file *curfile = NULL; + summary_file *curfile = nullptr; char linebuffer[1024]; char *linestart; int drivers = 0; @@ -322,14 +322,14 @@ static int read_summary_log(const char *filename, int index) /* open the logfile */ file = fopen(filename, "r"); - if (file == NULL) + if (file == nullptr) { fprintf(stderr, "Error: file '%s' not found\n", filename); return 1; } /* parse it */ - while (fgets(linebuffer, sizeof(linebuffer), file) != NULL) + while (fgets(linebuffer, sizeof(linebuffer), file) != nullptr) { /* trim the leading/trailing spaces */ linestart = trim_string(linebuffer); @@ -344,7 +344,7 @@ static int read_summary_log(const char *filename, int index) if (strncmp(linestart, "driver=", 7) == 0) { curfile = parse_driver_tag(linestart + 7, index); - if (curfile == NULL) + if (curfile == nullptr) goto error; drivers++; } @@ -353,7 +353,7 @@ static int read_summary_log(const char *filename, int index) else if (strncmp(linestart, "source=", 7) == 0) { /* error if no driver yet */ - if (curfile == NULL) + if (curfile == nullptr) { fprintf(stderr, "Unexpected @@@@@source= tag\n"); goto error; @@ -370,7 +370,7 @@ static int read_summary_log(const char *filename, int index) /* allocate a copy of the string */ lists[index].dir = (char *)malloc(strlen(dirname) + 1); - if (lists[index].dir == NULL) + if (lists[index].dir == nullptr) goto error; strcpy(lists[index].dir, dirname); fprintf(stderr, "Directory %s\n", lists[index].dir); @@ -378,7 +378,7 @@ static int read_summary_log(const char *filename, int index) } /* if not, consider other options */ - else if (curfile != NULL) + else if (curfile != nullptr) { int foundchars = 0; char *curptr; @@ -443,19 +443,19 @@ static summary_file *parse_driver_tag(char *linestart, int index) /* find the colon separating name from status */ colon = strchr(linestart, ':'); - if (colon == NULL) + if (colon == nullptr) { fprintf(stderr, "Unexpected text after @@@@@driver=\n"); - return NULL; + return nullptr; } /* NULL terminate at the colon and look up the file */ *colon = 0; curfile = get_file(trim_string(linestart)); - if (curfile == NULL) + if (curfile == nullptr) { fprintf(stderr, "Unable to allocate memory for driver\n"); - return NULL; + return nullptr; } /* clear out any old status for this file */ @@ -514,36 +514,36 @@ static summary_file *sort_file_list(void) numfiles = 0; for (c0 = 0; c0 < 128; c0++) for (c1 = 0; c1 < 128; c1++) - for (curfile = filehash[c0][c1]; curfile != NULL; curfile = curfile->next) + for (curfile = filehash[c0][c1]; curfile != nullptr; curfile = curfile->next) numfiles++; /* allocate an array of files */ filearray = (summary_file **)malloc(numfiles * sizeof(*filearray)); - if (filearray == NULL) + if (filearray == nullptr) { fprintf(stderr, "Out of memory!\n"); - return NULL; + return nullptr; } /* populate the array */ numfiles = 0; for (c0 = 0; c0 < 128; c0++) for (c1 = 0; c1 < 128; c1++) - for (curfile = filehash[c0][c1]; curfile != NULL; curfile = curfile->next) + for (curfile = filehash[c0][c1]; curfile != nullptr; curfile = curfile->next) filearray[numfiles++] = curfile; /* sort the array */ qsort(filearray, numfiles, sizeof(filearray[0]), compare_file); /* now regenerate a single list */ - listhead = NULL; + listhead = nullptr; tailptr = &listhead; for (filenum = 0; filenum < numfiles; filenum++) { *tailptr = filearray[filenum]; tailptr = &(*tailptr)->next; } - *tailptr = NULL; + *tailptr = nullptr; free(filearray); return listhead; @@ -566,7 +566,7 @@ static core_file *create_file_and_output_header(std::string &filename, std::stri /* create the indexfile */ if (core_fopen(filename.c_str(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS | OPEN_FLAG_NO_BOM, &file) != FILERR_NONE) - return NULL; + return nullptr; /* print a header */ std::string modified(templatefile); @@ -615,17 +615,17 @@ static void output_report(std::string &dirname, std::string &tempheader, std::st /* initialize the lists */ for (bucknum = 0; bucknum < BUCKET_COUNT; bucknum++) { - buckethead[bucknum] = NULL; + buckethead[bucknum] = nullptr; buckettailptr[bucknum] = &buckethead[bucknum]; } /* compute the total number of files */ total = 0; - for (curfile = filelist; curfile != NULL; curfile = curfile->next) + for (curfile = filelist; curfile != nullptr; curfile = curfile->next) total++; /* first bucketize the games */ - for (curfile = filelist; curfile != NULL; curfile = curfile->next) + for (curfile = filelist; curfile != nullptr; curfile = curfile->next) { int statcount[STATUS_COUNT] = { 0 }; int bucket = BUCKET_UNKNOWN; @@ -683,12 +683,12 @@ static void output_report(std::string &dirname, std::string &tempheader, std::st /* terminate all the lists */ for (bucknum = 0; bucknum < BUCKET_COUNT; bucknum++) - *buckettailptr[bucknum] = NULL; + *buckettailptr[bucknum] = nullptr; /* output header */ strprintf(tempname,"%s" PATH_SEPARATOR "%s", dirname.c_str(), "index.html"); indexfile = create_file_and_output_header(tempname, tempheader, title); - if (indexfile == NULL) + if (indexfile == nullptr) { fprintf(stderr, "Error creating file '%s'\n", tempname.c_str()); return; @@ -699,7 +699,7 @@ static void output_report(std::string &dirname, std::string &tempheader, std::st { int curbucket = bucket_output_order[bucknum]; - if (buckethead[curbucket] != NULL) + if (buckethead[curbucket] != nullptr) { fprintf(stderr, "Outputting bucket: %s\n", bucket_name[curbucket]); append_driver_list_table(bucket_name[curbucket], dirname, indexfile, buckethead[curbucket], tempheader, tempfooter); @@ -836,7 +836,7 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir, int width, height, maxwidth; int bitmapcount = 0; int listnum, bmnum; - core_file *file = NULL; + core_file *file = nullptr; file_error filerr; png_error pngerr; int error = -1; @@ -901,8 +901,8 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir, /* iterate over rows in these bitmaps */ for (y = 0; y < curheight; y++) { - UINT32 *src1 = (y < bitmap1.height()) ? &bitmap1.pix32(y) : NULL; - UINT32 *src2 = (y < bitmap2.height()) ? &bitmap2.pix32(y) : NULL; + UINT32 *src1 = (y < bitmap1.height()) ? &bitmap1.pix32(y) : nullptr; + UINT32 *src2 = (y < bitmap2.height()) ? &bitmap2.pix32(y) : nullptr; UINT32 *dst1 = &finalbitmap.pix32(starty + y, 0); UINT32 *dst2 = &finalbitmap.pix32(starty + y, bitmap1.width() + BITMAP_SPACE); UINT32 *dstdiff = &finalbitmap.pix32(starty + y, bitmap1.width() + BITMAP_SPACE + maxwidth + BITMAP_SPACE); @@ -912,9 +912,9 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir, { int pix1 = -1, pix2 = -2; - if (src1 != NULL && x < bitmap1.width()) + if (src1 != nullptr && x < bitmap1.width()) pix1 = dst1[x] = src1[x]; - if (src2 != NULL && x < bitmap2.width()) + if (src2 != nullptr && x < bitmap2.width()) pix2 = dst2[x] = src2[x]; dstdiff[x] = (pix1 != pix2) ? 0xffffffff : 0xff000000; } @@ -928,7 +928,7 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir, filerr = core_fopen(dstfilename.c_str(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &file); if (filerr != FILERR_NONE) goto error; - pngerr = png_write_bitmap(file, NULL, finalbitmap, 0, NULL); + pngerr = png_write_bitmap(file, nullptr, finalbitmap, 0, nullptr); core_fclose(file); if (pngerr != PNGERR_NONE) goto error; @@ -963,7 +963,7 @@ static void create_linked_file(std::string &dirname, const summary_file *curfile strprintf(title, "%s Regressions (%s)", curfile->name, curfile->source); strprintf(linkname,"%s" PATH_SEPARATOR "%s", dirname.c_str(), filename.c_str()); linkfile = create_file_and_output_header(linkname, tempheader, title); - if (linkfile == NULL) + if (linkfile == nullptr) { fprintf(stderr, "Error creating file '%s'\n", filename.c_str()); return; @@ -973,12 +973,12 @@ static void create_linked_file(std::string &dirname, const summary_file *curfile core_fprintf(linkfile, "\t

\n"); core_fprintf(linkfile, "\t\n"); core_fprintf(linkfile, "\t\t\n"); core_fprintf(linkfile, "\t\t\n"); core_fprintf(linkfile, "\t\t\n"); core_fprintf(linkfile, "\t
"); - if (prevfile != NULL) + if (prevfile != nullptr) core_fprintf(linkfile, "<< %s (%s)", prevfile->name, prevfile->name, prevfile->source); core_fprintf(linkfile, "Home"); - if (nextfile != NULL) + if (nextfile != nullptr) core_fprintf(linkfile, "%s (%s) >>", nextfile->name, nextfile->name, nextfile->source); core_fprintf(linkfile, "
\n"); @@ -993,7 +993,7 @@ static void create_linked_file(std::string &dirname, const summary_file *curfile core_fprintf(linkfile, "\n\t

%s

\n", lists[listnum].version); core_fprintf(linkfile, "\t

\n"); core_fprintf(linkfile, "\tStatus: %s\n", status_text[curfile->status[listnum]]); - if (pngfile != NULL) + if (pngfile != nullptr) imageindex = get_unique_index(curfile, listnum); if (imageindex != -1) core_fprintf(linkfile, " [%d]", imageindex); @@ -1008,7 +1008,7 @@ static void create_linked_file(std::string &dirname, const summary_file *curfile } /* output link to the image */ - if (pngfile != NULL) + if (pngfile != nullptr) { core_fprintf(linkfile, "\n\t

Screenshot Comparisons

\n"); core_fprintf(linkfile, "\t

\n"); @@ -1043,7 +1043,7 @@ static void append_driver_list_table(const char *header, std::string &dirname, c core_fprintf(indexfile, "\n\t\t\n"); /* if nothing, print a default message */ - if (listhead == NULL) + if (listhead == nullptr) { core_fprintf(indexfile, "\t\t\n\t\t\t"); core_fprintf(indexfile, "(No regressions detected)", list_count + 2); @@ -1051,16 +1051,16 @@ static void append_driver_list_table(const char *header, std::string &dirname, c } /* iterate over files */ - for (prevfile = NULL, curfile = listhead; curfile != NULL; prevfile = curfile, curfile = curfile->next) + for (prevfile = nullptr, curfile = listhead; curfile != nullptr; prevfile = curfile, curfile = curfile->next) { int rowspan = 0, uniqueshots = 0; char pngdiffname[40]; /* if this is the first entry in this source file, count how many rows we need to span */ - if (prevfile == NULL || strcmp(prevfile->source, curfile->source) != 0) + if (prevfile == nullptr || strcmp(prevfile->source, curfile->source) != 0) { const summary_file *cur; - for (cur = curfile; cur != NULL; cur = cur->next) + for (cur = curfile; cur != nullptr; cur = cur->next) if (strcmp(cur->source, curfile->source) == 0) rowspan++; else @@ -1080,7 +1080,7 @@ static void append_driver_list_table(const char *header, std::string &dirname, c } /* create a linked file */ - create_linked_file(dirname, curfile, prevfile, curfile->next, (pngdiffname[0] == 0) ? NULL : pngdiffname, tempheader, tempfooter); + create_linked_file(dirname, curfile, prevfile, curfile->next, (pngdiffname[0] == 0) ? nullptr : pngdiffname, tempheader, tempfooter); /* create a row */ core_fprintf(indexfile, "\t\t\n\t\t\t"); diff --git a/src/tools/romcmp.cpp b/src/tools/romcmp.cpp index 97cdfa47ab3..4d89718abe9 100644 --- a/src/tools/romcmp.cpp +++ b/src/tools/romcmp.cpp @@ -120,7 +120,7 @@ static void checkintegrity(const fileinfo *file,int side) int mask0,mask1; int addrbit; - if (file->buf == 0) return; + if (file->buf == nullptr) return; /* check for bad data lines */ mask0 = 0x0000; @@ -351,7 +351,7 @@ static float filecompare(const fileinfo *file1,const fileinfo *file2,int mode1,i int base1=0,base2=0,mult1=0,mult2=0,mask1=0,mask2=0; - if (file1->buf == 0 || file2->buf == 0) return 0.0; + if (file1->buf == nullptr || file2->buf == nullptr) return 0.0; size1 = usedbytes(file1,mode1); size2 = usedbytes(file2,mode2); @@ -397,7 +397,7 @@ static void readfile(const char *path,fileinfo *file) UINT64 filesize; UINT32 actual; char fullname[256]; - osd_file *f = 0; + osd_file *f = nullptr; if (path) { @@ -408,7 +408,7 @@ static void readfile(const char *path,fileinfo *file) else fullname[0] = 0; strcat(fullname,file->name); - if ((file->buf = (unsigned char *)malloc(file->size)) == 0) + if ((file->buf = (unsigned char *)malloc(file->size)) == nullptr) { printf("%s: out of memory!\n",file->name); return; @@ -436,7 +436,7 @@ static void readfile(const char *path,fileinfo *file) static void freefile(fileinfo *file) { free(file->buf); - file->buf = 0; + file->buf = nullptr; } @@ -455,12 +455,12 @@ static int load_files(int i, int *found, const char *path) /* attempt to open as a directory first */ dir = osd_opendir(path); - if (dir != NULL) + if (dir != nullptr) { const osd_directory_entry *d; /* load all files in directory */ - while ((d = osd_readdir(dir)) != NULL) + while ((d = osd_readdir(dir)) != nullptr) { const char *d_name = d->name; char buf[255+1]; @@ -506,7 +506,7 @@ static int load_files(int i, int *found, const char *path) } /* load all files in zip file */ - for (zipent = zip_file_first_file(zip); zipent != NULL; zipent = zip_file_next_file(zip)) + for (zipent = zip_file_first_file(zip); zipent != nullptr; zipent = zip_file_next_file(zip)) { int size; @@ -525,14 +525,14 @@ static int load_files(int i, int *found, const char *path) else strcpy(file->name,zipent->filename); file->size = zipent->uncompressed_length; - if ((file->buf = (unsigned char *)malloc(file->size)) == 0) + if ((file->buf = (unsigned char *)malloc(file->size)) == nullptr) printf("%s: out of memory!\n",file->name); else { if (zip_file_decompress(zip, (char *)file->buf, file->size) != ZIPERR_NONE) { free(file->buf); - file->buf = 0; + file->buf = nullptr; } } @@ -728,11 +728,11 @@ int CLIB_DECL main(int argc,char *argv[]) for (i = 0;i < found[0];i++) { - if (files[0][i].listed == 0) printname(&files[0][i],0,0.0,0,0); + if (files[0][i].listed == 0) printname(&files[0][i],nullptr,0.0,0,0); } for (i = 0;i < found[1];i++) { - if (files[1][i].listed == 0) printname(0,&files[1][i],0.0,0,0); + if (files[1][i].listed == 0) printname(nullptr,&files[1][i],0.0,0,0); } } diff --git a/src/tools/split.cpp b/src/tools/split.cpp index 302bc6d8d7f..043d93b3a78 100644 --- a/src/tools/split.cpp +++ b/src/tools/split.cpp @@ -64,9 +64,9 @@ static void compute_hash_as_string(std::string &buffer, void *data, UINT32 lengt static int split_file(const char *filename, const char *basename, UINT32 splitsize) { std::string outfilename, basefilename, splitfilename; - core_file *outfile = NULL, *infile = NULL, *splitfile = NULL; + core_file *outfile = nullptr, *infile = nullptr, *splitfile = nullptr; std::string computedhash; - void *splitbuffer = NULL; + void *splitbuffer = nullptr; int index, partnum; UINT64 totallength; file_error filerr; @@ -103,7 +103,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi // allocate a buffer for reading splitbuffer = malloc(splitsize); - if (splitbuffer == NULL) + if (splitbuffer == nullptr) { fprintf(stderr, "Fatal error: unable to allocate memory for the split\n"); goto cleanup; @@ -174,7 +174,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi goto cleanup; } core_fclose(outfile); - outfile = NULL; + outfile = nullptr; printf(" done\n"); @@ -188,21 +188,21 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi error = 0; cleanup: - if (splitfile != NULL) + if (splitfile != nullptr) { core_fclose(splitfile); if (error != 0) remove(splitfilename.c_str()); } - if (infile != NULL) + if (infile != nullptr) core_fclose(infile); - if (outfile != NULL) + if (outfile != nullptr) { core_fclose(outfile); if (error != 0) remove(outfilename.c_str()); } - if (splitbuffer != NULL) + if (splitbuffer != nullptr) free(splitbuffer); return error; } @@ -218,8 +218,8 @@ static int join_file(const char *filename, const char *outname, int write_output std::string expectedhash, computedhash; std::string outfilename, infilename; std::string basepath; - core_file *outfile = NULL, *infile = NULL, *splitfile = NULL; - void *splitbuffer = NULL; + core_file *outfile = nullptr, *infile = nullptr, *splitfile = nullptr; + void *splitbuffer = nullptr; file_error filerr; UINT32 splitsize; char buffer[256]; @@ -252,7 +252,7 @@ static int join_file(const char *filename, const char *outname, int write_output basepath.clear(); // override the output filename if specified, otherwise prepend the path - if (outname != NULL) + if (outname != nullptr) outfilename.assign(outname); else outfilename.insert(0, basepath); @@ -272,7 +272,7 @@ static int join_file(const char *filename, const char *outname, int write_output if (filerr == FILERR_NONE) { core_fclose(outfile); - outfile = NULL; + outfile = nullptr; fprintf(stderr, "Fatal error: output file '%s' already exists\n", outfilename.c_str()); goto cleanup; } @@ -346,7 +346,7 @@ static int join_file(const char *filename, const char *outname, int write_output // release allocated memory osd_free(splitbuffer); - splitbuffer = NULL; + splitbuffer = nullptr; } if (write_output) printf("File re-created successfully\n"); @@ -357,17 +357,17 @@ static int join_file(const char *filename, const char *outname, int write_output error = 0; cleanup: - if (splitfile != NULL) + if (splitfile != nullptr) core_fclose(splitfile); - if (infile != NULL) + if (infile != nullptr) core_fclose(infile); - if (outfile != NULL) + if (outfile != nullptr) { core_fclose(outfile); if (error != 0) remove(outfilename.c_str()); } - if (splitbuffer != NULL) + if (splitbuffer != nullptr) osd_free(splitbuffer); return error; } @@ -398,7 +398,7 @@ int main(int argc, char *argv[]) { if (argc != 3 && argc != 4) goto usage; - result = join_file(argv[2], (argc >= 4) ? argv[3] : NULL, TRUE); + result = join_file(argv[2], (argc >= 4) ? argv[3] : nullptr, TRUE); } /* verify command */ @@ -406,7 +406,7 @@ int main(int argc, char *argv[]) { if (argc != 3) goto usage; - result = join_file(argv[2], NULL, FALSE); + result = join_file(argv[2], nullptr, FALSE); } else goto usage; diff --git a/src/tools/src2html.cpp b/src/tools/src2html.cpp index 91780cd2fc6..62eefb4da56 100644 --- a/src/tools/src2html.cpp +++ b/src/tools/src2html.cpp @@ -99,7 +99,7 @@ static const ext_to_type extension_lookup[] = static const token_entry dummy_token_table[] = { - { NULL, KEYWORD_CLASS } + { nullptr, KEYWORD_CLASS } }; @@ -192,7 +192,7 @@ static const token_entry c_token_table[] = { "UINT64", CUSTOM_CLASS }, { "ARRAY_LENGTH", CUSTOM_CLASS }, */ - { NULL, KEYWORD_CLASS } + { nullptr, KEYWORD_CLASS } }; @@ -244,9 +244,9 @@ int main(int argc, char *argv[]) if (arg[0] == '-' && arg[1] == 'I') { *incpathhead = new include_path; - if (*incpathhead != NULL) + if (*incpathhead != nullptr) { - (*incpathhead)->next = NULL; + (*incpathhead)->next = nullptr; strreplacechr((*incpathhead)->path.assign(&arg[2]), '/', PATH_SEPARATOR[0]); incpathhead = &(*incpathhead)->next; } @@ -348,7 +348,7 @@ static int recurse_dir(int srcrootlen, int dstrootlen, std::string &srcdir, std: // open the directory and iterate through it osd_directory *dir = osd_opendir(srcdir.c_str()); - if (dir == NULL) + if (dir == nullptr) { result = 1; break; @@ -357,11 +357,11 @@ static int recurse_dir(int srcrootlen, int dstrootlen, std::string &srcdir, std: // build up the list of files const osd_directory_entry *entry; int found = 0; - list_entry *list = NULL; - while ((entry = osd_readdir(dir)) != NULL) + list_entry *list = nullptr; + while ((entry = osd_readdir(dir)) != nullptr) if (entry->type == entry_type && entry->name[0] != '.') { - list_entry *lentry = new list_entry; + auto lentry = new list_entry; lentry->name.assign(entry->name); lentry->next = list; list = lentry; @@ -376,16 +376,16 @@ static int recurse_dir(int srcrootlen, int dstrootlen, std::string &srcdir, std: continue; // allocate memory for sorting - list_entry **listarray = new list_entry *[found]; + auto listarray = new list_entry *[found]; found = 0; - for (list_entry *curlist = list; curlist != NULL; curlist = curlist->next) + for (list_entry *curlist = list; curlist != nullptr; curlist = curlist->next) listarray[found++] = curlist; // sort the list qsort(listarray, found, sizeof(listarray[0]), compare_list_entries); // rebuild the list - list = NULL; + list = nullptr; while (--found >= 0) { listarray[found]->next = list; @@ -394,7 +394,7 @@ static int recurse_dir(int srcrootlen, int dstrootlen, std::string &srcdir, std: delete[] listarray; // iterate through each file - for (list_entry *curlist = list; curlist != NULL && result == 0; curlist = curlist->next) + for (list_entry *curlist = list; curlist != nullptr && result == 0; curlist = curlist->next) { // add a header if (curlist == list) @@ -421,7 +421,7 @@ static int recurse_dir(int srcrootlen, int dstrootlen, std::string &srcdir, std: if (type != FILE_TYPE_INVALID) { strprintf(dstfile, "%s%c%s.html", dstdir.c_str(), PATH_SEPARATOR[0], curlist->name.c_str()); - if (indexfile != NULL) + if (indexfile != nullptr) core_fprintf(indexfile, "\t

  • %s
  • \n", curlist->name.c_str(), curlist->name.c_str()); result = output_file(type, srcrootlen, dstrootlen, srcfile, dstfile, srcdir.compare(dstdir) == 0, tempheader, tempfooter); } @@ -431,18 +431,18 @@ static int recurse_dir(int srcrootlen, int dstrootlen, std::string &srcdir, std: else { strprintf(dstfile, "%s%c%s", dstdir.c_str(), PATH_SEPARATOR[0], curlist->name.c_str()); - if (indexfile != NULL) + if (indexfile != nullptr) core_fprintf(indexfile, "\t
  • %s/
  • \n", curlist->name.c_str(), curlist->name.c_str()); result = recurse_dir(srcrootlen, dstrootlen, srcfile, dstfile, tempheader, tempfooter); } } // close the list if we found some stuff - if (list != NULL) + if (list != nullptr) core_fprintf(indexfile, "\t\n"); // free all the allocated entries - while (list != NULL) + while (list != nullptr) { list_entry *next = list->next; delete list; @@ -450,7 +450,7 @@ static int recurse_dir(int srcrootlen, int dstrootlen, std::string &srcdir, std: } } - if (indexfile != NULL) + if (indexfile != nullptr) output_footer_and_close_file(indexfile, tempfooter, srcdir_subpath); return result; } @@ -525,7 +525,7 @@ static int output_file(file_type type, int srcrootlen, int dstrootlen, std::stri // open the output file core_file *dst = create_file_and_output_header(dstfile, tempheader, srcfile_subpath); - if (dst == NULL) + if (dst == nullptr) { fprintf(stderr, "Unable to write file '%s'\n", dstfile.c_str()); core_fclose(src); @@ -544,7 +544,7 @@ static int output_file(file_type type, int srcrootlen, int dstrootlen, std::stri int linenum = 1; bool in_comment = false; char srcline[4096]; - while (core_fgets(srcline, ARRAY_LENGTH(srcline), src) != NULL) + while (core_fgets(srcline, ARRAY_LENGTH(srcline), src) != nullptr) { // start with the line number std::string dstline; @@ -608,7 +608,7 @@ static int output_file(file_type type, int srcrootlen, int dstrootlen, std::stri // scan the token table last_token_was_include = false; - for (curtoken = token_table; curtoken->token != NULL; curtoken++) + for (curtoken = token_table; curtoken->token != nullptr; curtoken++) if (strncmp(srcptr - 1, curtoken->token, toklength) == 0 && strlen(curtoken->token) == toklength) { strcatprintf(dstline, "%s", curtoken->color, curtoken->token); @@ -653,7 +653,7 @@ static int output_file(file_type type, int srcrootlen, int dstrootlen, std::stri if (last_token_was_include) { char *endquote = strchr(srcptr, ch); - if (endquote != NULL) + if (endquote != nullptr) { std::string filename(srcptr, endquote - srcptr); std::string target; @@ -734,7 +734,7 @@ static core_file *create_file_and_output_header(std::string &filename, std::stri // create the indexfile core_file *file; if (core_fopen(filename.c_str(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS | OPEN_FLAG_NO_BOM, &file) != FILERR_NONE) - return NULL; + return nullptr; // print a header std::string modified(templatefile); @@ -831,7 +831,7 @@ static void output_path_as_links(core_file *file, std::string &path, bool end_is static bool find_include_file(std::string &srcincpath, int srcrootlen, int dstrootlen, std::string &srcfile, std::string &dstfile, std::string &filename) { // iterate over include paths and find the file - for (include_path *curpath = incpaths; curpath != NULL; curpath = curpath->next) + for (include_path *curpath = incpaths; curpath != nullptr; curpath = curpath->next) { // a '.' include path is specially treated if (curpath->path.compare(".") == 0) diff --git a/src/tools/srcclean.cpp b/src/tools/srcclean.cpp index 24db9bca880..0af298a4441 100644 --- a/src/tools/srcclean.cpp +++ b/src/tools/srcclean.cpp @@ -39,7 +39,7 @@ static int le_convert(char *buffer, int size) /* brute force */ *end = 0; pos = strchr(buffer, 0x0d); - while (pos != NULL) + while (pos != nullptr) { memmove(pos, pos+1,end - pos + 1); size--; @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) /* read the file */ file = fopen(argv[1], "rb"); - if (file == NULL) + if (file == nullptr) { fprintf(stderr, "Can't open %s\n", argv[1]); return 1; @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) fclose(file); /* check whether we have dos line endings and are in unix mode */ - if (unix_le && (strchr((char *) original, 0x0d) != NULL)) + if (unix_le && (strchr((char *) original, 0x0d) != nullptr)) fixed_dos_style = 1; /* determine if we are a C file */ diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp index 7a245886d6a..13eabe31c59 100644 --- a/src/tools/unidasm.cpp +++ b/src/tools/unidasm.cpp @@ -454,7 +454,7 @@ static int parse_options(int argc, char *argv[], options *opts) } // filename - else if (opts->filename == NULL) + else if (opts->filename == nullptr) opts->filename = curarg; // fail @@ -467,7 +467,7 @@ static int parse_options(int argc, char *argv[], options *opts) goto usage; // if no file or no architecture, fail - if (opts->filename == NULL || opts->dasm == NULL) + if (opts->filename == nullptr || opts->dasm == nullptr) goto usage; return 0; @@ -545,7 +545,7 @@ int main(int argc, char *argv[]) int numchunks; // disassemble - pcdelta = (*opts.dasm->func)(NULL, buffer, curpc, oprom, oprom, opts.mode) & DASMFLAG_LENGTHMASK; + pcdelta = (*opts.dasm->func)(nullptr, buffer, curpc, oprom, oprom, opts.mode) & DASMFLAG_LENGTHMASK; if (opts.dasm->pcshift < 0) numbytes = pcdelta << -opts.dasm->pcshift; -- cgit v1.2.3