Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-03 19:36:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make -romident use mame_printf_info consistently.

Browse Source
This commit is contained in:
Aaron Giles 2011-04-17 14:38:09 +00:00
parent 8511e83106
commit 7a63b54cee
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/emu/clifront.c
View File

@ -1084,7 +1084,6 @@ void cli_frontend::romident(const char *filename)
// identify the file, then output results
mame_printf_info("Identifying %s....\n", filename);
ident.identify(filename);
mame_printf_info("%s\n", ident.result());
// return the appropriate error code
if (ident.matches() == ident.total())
@ -1311,7 +1310,7 @@ void media_identifier::identify_file(const char *name)
{
// output the name
astring basename;
m_result.catprintf("%-20s", core_filename_extract_base(&basename, name, FALSE)->cstr());
mame_printf_info("%-20s", core_filename_extract_base(&basename, name, FALSE)->cstr());
m_total++;
// attempt to open as a CHD; fail if not
@ -1319,7 +1318,7 @@ void media_identifier::identify_file(const char *name)
chd_error err = chd_open(name, CHD_OPEN_READ, NULL, &chd);
if (err != CHDERR_NONE)
{
m_result.catprintf("NOT A CHD\n");
mame_printf_info("NOT A CHD\n");
m_nonroms++;
return;
}
@ -1331,7 +1330,7 @@ void media_identifier::identify_file(const char *name)
// error on writable CHDs
if (header.flags & CHDFLAGS_IS_WRITEABLE)
{
m_result.catprintf("is a writeable CHD\n");
mame_printf_info("is a writeable CHD\n");
return;
}
@ -1347,7 +1346,7 @@ void media_identifier::identify_file(const char *name)
// determine whether this file exists
int found = find_by_hash(hashes, header.logicalbytes);
if (found == 0)
m_result.catprintf("NO MATCH\n");
mame_printf_info("NO MATCH\n");
else
m_matches++;
}
@ -1392,7 +1391,7 @@ void media_identifier::identify_data(const char *name, const UINT8 *data, int le
// output the name
m_total++;
astring basename;
m_result.catprintf("%-20s", core_filename_extract_base(&basename, name, FALSE)->cstr());
mame_printf_info("%-20s", core_filename_extract_base(&basename, name, FALSE)->cstr());
// see if we can find a match in the ROMs
int found = find_by_hash(hashes, length);
@ -1403,13 +1402,13 @@ void media_identifier::identify_data(const char *name, const UINT8 *data, int le
// if not a power of 2, assume it is a non-ROM file
if ((length & (length - 1)) != 0)
{
m_result.catprintf("NOT A ROM\n");
mame_printf_info("NOT A ROM\n");
m_nonroms++;
}
// otherwise, it's just not a match
else
m_result.catprintf("NO MATCH\n");
mame_printf_info("NO MATCH\n");
}
// if we did find it, count it as a match

4
src/emu/clifront.h
View File

@ -140,13 +140,12 @@ public:
media_identifier(cli_options &options);
// getters
const char *result() const { return m_result; }
int total() const { return m_total; }
int matches() const { return m_matches; }
int nonroms() const { return m_nonroms; }
// operations
void reset() { m_total = m_matches = m_nonroms = 0; m_result.reset(); }
void reset() { m_total = m_matches = m_nonroms = 0; }
void identify(const char *name);
void identify_file(const char *name);
void identify_data(const char *name, const UINT8 *data, int length);
@ -155,7 +154,6 @@ public:
private:
// internal state
driver_enumerator m_drivlist;
astring m_result;
int m_total;
int m_matches;
int m_nonroms;