Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-11 16:48:52 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Imgtool] Cleanups to validity code, and transitioned to std::wcerr

Browse Source 
Windows doesn't like mixing std::wc[out|err] and printf()
This commit is contained in:
Nathan Woods 2017-04-29 09:59:37 -04:00 committed by Vas Crabb
parent 0514442753
commit f4fbe39329
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/tools/imgtool/imgtool.cpp
View File

@ -10,6 +10,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <iostream>
#include "imgtool.h" #include "imgtool.h"
#include "formats/imageutl.h" #include "formats/imageutl.h"
@ -783,15 +784,14 @@ void imgtool::partition::get_attribute_name(uint32_t attribute, const imgtool_at
} }
//-------------------------------------------------
// imgtool_validitychecks - checks the validity
// of the imgtool modules
//-------------------------------------------------
/*------------------------------------------------- bool imgtool_validitychecks(void)
imgtool_validitychecks - checks the validity
of the imgtool modules
-------------------------------------------------*/
int imgtool_validitychecks(void)
{ {
int error = 0; bool error = false;
imgtoolerr_t err = (imgtoolerr_t)IMGTOOLERR_SUCCESS; imgtoolerr_t err = (imgtoolerr_t)IMGTOOLERR_SUCCESS;
imgtool_module_features features; imgtool_module_features features;
int created_library = false; int created_library = false;
@ -808,18 +808,18 @@ int imgtool_validitychecks(void)
if (!module->name) if (!module->name)
{ {
printf("imgtool module %s has null 'name'\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s has null 'name'\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
if (!module->description) if (!module->description)
{ {
printf("imgtool module %s has null 'description'\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s has null 'description'\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
if (!module->extensions) if (!module->extensions)
{ {
printf("imgtool module %s has null 'extensions'\n", module->extensions); util::stream_format(std::wcerr, L"imgtool module %s has null 'extensions'\n", wstring_from_utf8(module->extensions));
error = 1; error = true;
} }
#if 0 #if 0
@ -828,23 +828,23 @@ int imgtool_validitychecks(void)
{ {
if (module->alternate_path_separator) if (module->alternate_path_separator)
{ {
printf("imgtool module %s specified alternate_path_separator but not path_separator\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s specified alternate_path_separator but not path_separator\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
if (module->initial_path_separator) if (module->initial_path_separator)
{ {
printf("imgtool module %s specified initial_path_separator without directory support\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s specified initial_path_separator without directory support\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
if (module->create_dir) if (module->create_dir)
{ {
printf("imgtool module %s implements create_dir without directory support\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s implements create_dir without directory support\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
if (module->delete_dir) if (module->delete_dir)
{ {
printf("imgtool module %s implements delete_dir without directory support\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s implements delete_dir without directory support\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
} }
#endif #endif
@ -854,14 +854,14 @@ int imgtool_validitychecks(void)
{ {
if (!module->create) if (!module->create)
{ {
printf("imgtool module %s has creation options without supporting create\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s has creation options without supporting create\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
if ((!module->createimage_optguide && module->createimage_optspec) if ((!module->createimage_optguide && module->createimage_optspec)
|| (module->createimage_optguide && !module->createimage_optspec)) || (module->createimage_optguide && !module->createimage_optspec))
{ {
printf("imgtool module %s does has partially incomplete creation options\n", module->name); util::stream_format(std::wcerr, L"imgtool module %s does has partially incomplete creation options\n", wstring_from_utf8(module->name));
error = 1; error = true;
} }
if (module->createimage_optguide && module->createimage_optspec) if (module->createimage_optguide && module->createimage_optspec)
@ -876,8 +876,8 @@ int imgtool_validitychecks(void)
imgtool_exit(); imgtool_exit();
if (err) if (err)
{ {
printf("imgtool: %s\n", imgtool_error(err)); util::stream_format(std::wcerr, L"imgtool: %s\n", wstring_from_utf8(imgtool_error(err)));
error = 1; error = true;
} }
return error; return error;
} }

2
src/tools/imgtool/imgtool.h
View File

@ -261,7 +261,7 @@ namespace imgtool
}; };
/* ----- special ----- */ /* ----- special ----- */
int imgtool_validitychecks(void); bool imgtool_validitychecks(void);
void unknown_partition_get_info(const imgtool_class *imgclass, uint32_t state, union imgtoolinfo *info); void unknown_partition_get_info(const imgtool_class *imgclass, uint32_t state, union imgtoolinfo *info);
char *strncpyz(char *dest, const char *source, size_t len); char *strncpyz(char *dest, const char *source, size_t len);