summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/imagedev/diablo.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/imagedev/diablo.c')
-rw-r--r--src/emu/imagedev/diablo.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/emu/imagedev/diablo.c b/src/emu/imagedev/diablo.c
index 1f4af5b3242..6dbaa941f4a 100644
--- a/src/emu/imagedev/diablo.c
+++ b/src/emu/imagedev/diablo.c
@@ -115,7 +115,7 @@ bool diablo_image_device::call_create(int create_format, option_resolution *crea
int err;
UINT32 sectorsize, hunksize;
UINT32 cylinders, heads, sectors, totalsectors;
- astring metadata;
+ std::string metadata;
cylinders = option_resolution_lookup_int(create_args, 'C');
heads = option_resolution_lookup_int(create_args, 'H');
@@ -132,7 +132,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 */
- metadata.format(HARD_DISK_METADATA_FORMAT, cylinders, heads, sectors, sectorsize);
+ strprintf(metadata,HARD_DISK_METADATA_FORMAT, cylinders, heads, sectors, sectorsize);
err = m_origchd.write_metadata(HARD_DISK_METADATA_TAG, 0, metadata);
m_origchd.close();
@@ -170,7 +170,7 @@ void diablo_image_device::call_unload()
static chd_error open_disk_diff(emu_options &options, const char *name, chd_file &source, chd_file &diff_chd)
{
- astring fname = astring(name).cat(".dif");
+ std::string fname = std::string(name).append(".dif");
/* try to open the diff */
//printf("Opening differencing image file: %s\n", fname.c_str());
@@ -178,7 +178,7 @@ static chd_error open_disk_diff(emu_options &options, const char *name, chd_file
file_error filerr = diff_file.open(fname.c_str());
if (filerr == FILERR_NONE)
{
- astring fullpath(diff_file.fullpath());
+ std::string fullpath(diff_file.fullpath());
diff_file.close();
//printf("Opening differencing image file: %s\n", fullpath.c_str());
@@ -191,7 +191,7 @@ static chd_error open_disk_diff(emu_options &options, const char *name, chd_file
filerr = diff_file.open(fname.c_str());
if (filerr == FILERR_NONE)
{
- astring fullpath(diff_file.fullpath());
+ std::string fullpath(diff_file.fullpath());
diff_file.close();
/* create the CHD */
@@ -209,7 +209,6 @@ static chd_error open_disk_diff(emu_options &options, const char *name, chd_file
int diablo_image_device::internal_load_dsk()
{
- astring tempstring;
chd_error err = CHDERR_NONE;
m_chd = NULL;
@@ -220,7 +219,7 @@ int diablo_image_device::internal_load_dsk()
/* open the CHD file */
if (software_entry() != NULL)
{
- m_chd = get_disk_handle(device().machine(), device().subtag(tempstring, "harddriv").c_str());
+ m_chd = get_disk_handle(device().machine(), device().subtag("harddriv").c_str());
}
else
{