summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/imgtool/imgtool.cpp
diff options
context:
space:
mode:
author Nathan Woods <npwoods@mess.org>2016-10-17 07:36:51 -0400
committer Nathan Woods <npwoods@mess.org>2016-10-17 07:36:51 -0400
commit9546118988f387c7acf5485498eda2abfb63488e (patch)
tree35cfa07f9adc1baa450296d94e22043b94783372 /src/tools/imgtool/imgtool.cpp
parenteab8fe41c3b8b6524d49ddd4da2ba1e7ca461a52 (diff)
[Imgtool] Bulk change: 'imgtool::directory *' ==> 'imgtool::directory &'
Diffstat (limited to 'src/tools/imgtool/imgtool.cpp')
-rw-r--r--src/tools/imgtool/imgtool.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp
index 2aef2f62616..1ef624b5c5a 100644
--- a/src/tools/imgtool/imgtool.cpp
+++ b/src/tools/imgtool/imgtool.cpp
@@ -569,9 +569,9 @@ imgtool::partition::partition(imgtool::image &image, imgtool_class &imgclass, in
m_supports_creation_time = imgtool_get_info_int(&imgclass, IMGTOOLINFO_INT_SUPPORTS_CREATION_TIME) ? 1 : 0;
m_supports_lastmodified_time = imgtool_get_info_int(&imgclass, IMGTOOLINFO_INT_SUPPORTS_LASTMODIFIED_TIME) ? 1 : 0;
m_supports_bootblock = imgtool_get_info_int(&imgclass, IMGTOOLINFO_INT_SUPPORTS_BOOTBLOCK) ? 1 : 0;
- m_begin_enum = (imgtoolerr_t(*)(imgtool::directory *, const char *)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_BEGIN_ENUM);
- m_next_enum = (imgtoolerr_t(*)(imgtool::directory *, imgtool_dirent *)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_NEXT_ENUM);
- m_close_enum = (void(*)(imgtool::directory *)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_CLOSE_ENUM);
+ m_begin_enum = (imgtoolerr_t(*)(imgtool::directory &, const char *)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_BEGIN_ENUM);
+ m_next_enum = (imgtoolerr_t(*)(imgtool::directory &, imgtool_dirent &)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_NEXT_ENUM);
+ m_close_enum = (void(*)(imgtool::directory &)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_CLOSE_ENUM);
m_free_space = (imgtoolerr_t(*)(imgtool::partition &, UINT64 *)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_FREE_SPACE);
m_read_file = (imgtoolerr_t(*)(imgtool::partition &, const char *, const char *, imgtool::stream &)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_READ_FILE);
m_write_file = (imgtoolerr_t(*)(imgtool::partition &, const char *, const char *, imgtool::stream &, util::option_resolution *)) imgtool_get_info_fct(&imgclass, IMGTOOLINFO_PTR_WRITE_FILE);
@@ -2461,7 +2461,7 @@ imgtoolerr_t imgtool::directory::open(imgtool::partition &partition, const char
if (partition.m_begin_enum)
{
- err = partition.m_begin_enum(enumeration.get(), path);
+ err = partition.m_begin_enum(*enumeration, path);
if (err)
{
err = markerrorsource(err);
@@ -2488,7 +2488,7 @@ done:
imgtool::directory::~directory()
{
if (m_okay_to_close && m_partition.m_close_enum)
- m_partition.m_close_enum(this);
+ m_partition.m_close_enum(*this);
}
@@ -2505,7 +2505,7 @@ imgtoolerr_t imgtool::directory::get_next(imgtool_dirent &ent)
// the attributes if they don't apply
memset(&ent, 0, sizeof(ent));
- err = m_partition.m_next_enum(this, &ent);
+ err = m_partition.m_next_enum(*this, ent);
if (err)
return markerrorsource(err);