diff options
author | 2016-02-28 11:09:00 +1100 | |
---|---|---|
committer | 2016-02-28 13:36:19 +1100 | |
commit | aec01e740736db267e452f0ed5947649f79e3408 (patch) | |
tree | 633ca7d80a756bfcc05d871817201c729e55142d /src/lib/util/cdrom.cpp | |
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/lib/util/cdrom.cpp')
-rw-r--r-- | src/lib/util/cdrom.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp index 2235119f776..10a1828d5e4 100644 --- a/src/lib/util/cdrom.cpp +++ b/src/lib/util/cdrom.cpp @@ -1288,10 +1288,9 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc) chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc) { chd_error err; - int i; /* write the metadata */ - for (i = 0; i < toc->numtrks; i++) + for (int i = 0; i < toc->numtrks; i++) { std::string metadata; if (!(toc->flags & CD_FLAG_GDROM)) @@ -1308,7 +1307,7 @@ chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc) strcpy(submode, cdrom_get_type_string(toc->tracks[i].pgtype)); } - strprintf(metadata, CDROM_TRACK_METADATA2_FORMAT, i + 1, cdrom_get_type_string(toc->tracks[i].trktype), + metadata = string_format(CDROM_TRACK_METADATA2_FORMAT, i + 1, cdrom_get_type_string(toc->tracks[i].trktype), cdrom_get_subtype_string(toc->tracks[i].subtype), toc->tracks[i].frames, toc->tracks[i].pregap, submode, cdrom_get_subtype_string(toc->tracks[i].pgsub), toc->tracks[i].postgap); @@ -1316,7 +1315,7 @@ chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc) } else { - strprintf(metadata, GDROM_TRACK_METADATA_FORMAT, i + 1, cdrom_get_type_string(toc->tracks[i].trktype), + metadata = string_format(GDROM_TRACK_METADATA_FORMAT, i + 1, cdrom_get_type_string(toc->tracks[i].trktype), cdrom_get_subtype_string(toc->tracks[i].subtype), toc->tracks[i].frames, toc->tracks[i].padframes, toc->tracks[i].pregap, cdrom_get_type_string(toc->tracks[i].pgtype), cdrom_get_subtype_string(toc->tracks[i].pgsub), toc->tracks[i].postgap); |