summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/imgtool/filter.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/filter.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/tools/imgtool/filter.cpp')
-rw-r--r--src/tools/imgtool/filter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/imgtool/filter.cpp b/src/tools/imgtool/filter.cpp
index 5887d6b501d..cd90026b6f7 100644
--- a/src/tools/imgtool/filter.cpp
+++ b/src/tools/imgtool/filter.cpp
@@ -25,7 +25,7 @@ INT64 filter_get_info_int(filter_getinfoproc get_info, UINT32 state)
void *filter_get_info_ptr(filter_getinfoproc get_info, UINT32 state)
{
union filterinfo info;
- info.p = NULL;
+ info.p = nullptr;
get_info(state, &info);
return info.p;
}
@@ -33,7 +33,7 @@ void *filter_get_info_ptr(filter_getinfoproc get_info, UINT32 state)
void *filter_get_info_fct(filter_getinfoproc get_info, UINT32 state)
{
union filterinfo info;
- info.f = NULL;
+ info.f = nullptr;
get_info(state, &info);
return info.f;
}
@@ -41,7 +41,7 @@ void *filter_get_info_fct(filter_getinfoproc get_info, UINT32 state)
const char *filter_get_info_string(filter_getinfoproc get_info, UINT32 state)
{
union filterinfo info;
- info.s = NULL;
+ info.s = nullptr;
get_info(state, &info);
return info.s;
}
@@ -61,7 +61,7 @@ const filter_getinfoproc filters[] =
filter_thombas128_getinfo,
filter_thomcrypt_getinfo,
filter_bml3bas_getinfo,
- NULL
+ nullptr
};
@@ -78,5 +78,5 @@ filter_getinfoproc filter_lookup(const char *name)
return filters[i];
}
- return NULL;
+ return nullptr;
}