diff options
author | Vas Crabb <vas@vastheman.com> | 2016-02-28 11:09:00 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2016-02-28 13:36:19 +1100 |
commit | aec01e740736db267e452f0ed5947649f79e3408 (patch) | |
tree | 633ca7d80a756bfcc05d871817201c729e55142d /src/devices/imagedev | |
parent | 3cba23966f6c1c6f9ee616e5af00ebcfcb0d0b0a (diff) |
Replace strformat, strprintf and strcatprintf with type-safe steam_format and string_format
Update MAME to use new function
Instantiate ODR-used static constant members
Make some of the UI code more localisable
Remove use of retired functions in tools
Diffstat (limited to 'src/devices/imagedev')
-rw-r--r-- | src/devices/imagedev/diablo.cpp | 4 | ||||
-rw-r--r-- | src/devices/imagedev/harddriv.cpp | 4 | ||||
-rw-r--r-- | src/devices/imagedev/mfmhd.cpp | 10 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp index be8b3e500f2..f9d4218856a 100644 --- a/src/devices/imagedev/diablo.cpp +++ b/src/devices/imagedev/diablo.cpp @@ -113,7 +113,6 @@ bool diablo_image_device::call_create(int create_format, option_resolution *crea int err; UINT32 sectorsize, hunksize; UINT32 cylinders, heads, sectors, totalsectors; - std::string metadata; cylinders = option_resolution_lookup_int(create_args, 'C'); heads = option_resolution_lookup_int(create_args, 'H'); @@ -130,8 +129,7 @@ bool diablo_image_device::call_create(int create_format, option_resolution *crea goto error; /* if we created the image and hence, have metadata to set, set the metadata */ - strprintf(metadata,HARD_DISK_METADATA_FORMAT, cylinders, heads, sectors, sectorsize); - err = m_origchd.write_metadata(HARD_DISK_METADATA_TAG, 0, metadata); + err = m_origchd.write_metadata(HARD_DISK_METADATA_TAG, 0, string_format(HARD_DISK_METADATA_FORMAT, cylinders, heads, sectors, sectorsize)); m_origchd.close(); if (err != CHDERR_NONE) diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp index b5fd6ca87dc..c03b0e4075b 100644 --- a/src/devices/imagedev/harddriv.cpp +++ b/src/devices/imagedev/harddriv.cpp @@ -137,7 +137,6 @@ bool harddisk_image_device::call_create(int create_format, option_resolution *cr int err; UINT32 sectorsize, hunksize; UINT32 cylinders, heads, sectors, totalsectors; - std::string metadata; cylinders = option_resolution_lookup_int(create_args, 'C'); heads = option_resolution_lookup_int(create_args, 'H'); @@ -154,8 +153,7 @@ bool harddisk_image_device::call_create(int create_format, option_resolution *cr goto error; /* if we created the image and hence, have metadata to set, set the metadata */ - strprintf(metadata, HARD_DISK_METADATA_FORMAT, cylinders, heads, sectors, sectorsize); - err = m_origchd.write_metadata(HARD_DISK_METADATA_TAG, 0, metadata); + err = m_origchd.write_metadata(HARD_DISK_METADATA_TAG, 0, string_format(HARD_DISK_METADATA_FORMAT, cylinders, heads, sectors, sectorsize)); m_origchd.close(); if (err != CHDERR_NONE) diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp index bc8987d7b0f..843e3510f29 100644 --- a/src/devices/imagedev/mfmhd.cpp +++ b/src/devices/imagedev/mfmhd.cpp @@ -531,11 +531,8 @@ void mfm_harddisk_device::call_unload() { logerror("%s: MFM HD sector arrangement and recording specs have changed; updating CHD metadata\n", tag()); chd_file* chdfile = get_chd_file(); - std::string metadata; - strprintf(metadata, MFMHD_REC_METADATA_FORMAT, params->interleave, params->cylskew, params->headskew, params->write_precomp_cylinder, params->reduced_wcurr_cylinder); - - chd_error err = chdfile->write_metadata(MFM_HARD_DISK_METADATA_TAG, 0, metadata, 0); + chd_error err = chdfile->write_metadata(MFM_HARD_DISK_METADATA_TAG, 0, string_format(MFMHD_REC_METADATA_FORMAT, params->interleave, params->cylskew, params->headskew, params->write_precomp_cylinder, params->reduced_wcurr_cylinder), 0); if (err != CHDERR_NONE) { logerror("%s: Failed to save MFM HD sector arrangement/recording specs to CHD\n", tag()); @@ -546,11 +543,8 @@ void mfm_harddisk_device::call_unload() { logerror("%s: MFM HD track gap specs have changed; updating CHD metadata\n", tag()); chd_file* chdfile = get_chd_file(); - std::string metadata; - - strprintf(metadata, MFMHD_GAP_METADATA_FORMAT, params->gap1, params->gap2, params->gap3, params->sync, params->headerlen, params->ecctype); - chd_error err = chdfile->write_metadata(MFM_HARD_DISK_METADATA_TAG, 1, metadata, 0); + chd_error err = chdfile->write_metadata(MFM_HARD_DISK_METADATA_TAG, 1, string_format(MFMHD_GAP_METADATA_FORMAT, params->gap1, params->gap2, params->gap3, params->sync, params->headerlen, params->ecctype), 0); if (err != CHDERR_NONE) { logerror("%s: Failed to save MFM HD track gap specs to CHD\n", tag()); |