summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/imgtool/modules.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/tools/imgtool/modules.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/tools/imgtool/modules.cpp')
-rw-r--r--src/tools/imgtool/modules.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/imgtool/modules.cpp b/src/tools/imgtool/modules.cpp
index 982fec1972c..72f81b862b9 100644
--- a/src/tools/imgtool/modules.cpp
+++ b/src/tools/imgtool/modules.cpp
@@ -60,18 +60,18 @@ imgtoolerr_t imgtool_create_cannonical_library(int omit_untested, imgtool_librar
/* if we are omitting untested, go through and block out the functionality in question */
if (omit_untested)
{
- module = NULL;
- while((module = imgtool_library_iterate(lib, module)) != NULL)
+ module = nullptr;
+ while((module = imgtool_library_iterate(lib, module)) != nullptr)
{
if (module->writing_untested)
{
- module->write_sector = NULL;
+ module->write_sector = nullptr;
}
if (module->creation_untested)
{
- module->create = NULL;
- module->createimage_optguide = NULL;
- module->createimage_optspec = NULL;
+ module->create = nullptr;
+ module->createimage_optguide = nullptr;
+ module->createimage_optspec = nullptr;
}
}
}