summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-08-02 12:08:15 -0400
committer AJR <ajrhacker@users.noreply.github.com>2019-08-02 12:12:04 -0400
commit8013c43adf62485a9f9d95a45c525c97191c9398 (patch)
tree490dde363aeebcc50ad703a1136664152023065c
parent478ec7352fec88d0506cc645a832677c6bc153d2 (diff)
Use canonical spelling of "canonical" (nw)
-rw-r--r--src/emu/diimage.h2
-rw-r--r--src/emu/emuopts.cpp36
-rw-r--r--src/emu/emuopts.h2
-rw-r--r--src/lib/formats/cassimg.cpp4
-rw-r--r--src/lib/formats/cassimg.h4
-rw-r--r--src/lib/util/options.h2
-rw-r--r--src/lib/util/zippath.cpp2
-rw-r--r--src/mame/video/gime.cpp2
-rw-r--r--src/osd/modules/file/winfile.cpp2
-rw-r--r--src/osd/modules/file/winrtfile.cpp2
-rw-r--r--src/tools/imgtool/imgtool.cpp106
-rw-r--r--src/tools/imgtool/imgtool.h4
-rw-r--r--src/tools/imgtool/modules.cpp4
-rw-r--r--src/tools/imgtool/modules.h2
-rw-r--r--src/tools/imgtool/modules/fat.cpp20
15 files changed, 97 insertions, 97 deletions
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 0ebdd9e5ea6..51a032d35e6 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -203,7 +203,7 @@ public:
const std::string &instance_name() const { return m_instance_name; }
const std::string &brief_instance_name() const { return m_brief_instance_name; }
- const std::string &cannonical_instance_name() const { return m_canonical_instance_name; }
+ const std::string &canonical_instance_name() const { return m_canonical_instance_name; }
bool uses_file_extension(const char *file_extension) const;
const formatlist_type &formatlist() const { return m_formatlist; }
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index e2beaf0089d..1d52bc958d5 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -385,9 +385,9 @@ namespace
if (!same_name)
result.push_back(image.brief_instance_name());
- if (image.instance_name() != image.cannonical_instance_name())
+ if (image.instance_name() != image.canonical_instance_name())
{
- result.push_back(image.cannonical_instance_name());
+ result.push_back(image.canonical_instance_name());
if (!same_name)
result.push_back(image.brief_instance_name() + "1");
}
@@ -565,7 +565,7 @@ bool emu_options::add_and_remove_slot_options()
for (const device_slot_interface &slot : slot_interface_iterator(config.root_device()))
{
- // come up with the cannonical name of the slot
+ // come up with the canonical name of the slot
const char *slot_option_name = slot.slot_name();
// erase this option from existing (so we don't purge it later)
@@ -631,7 +631,7 @@ bool emu_options::add_and_remove_image_options()
// "cartridge" starting out, but become "cartridge1" when another cartridge device is added.
//
// To get around this behavior, our internal data structures work in terms of what is
- // returned by cannonical_instance_name(), which will be something like "cartridge1" both
+ // returned by canonical_instance_name(), which will be something like "cartridge1" both
// for a singular cartridge device and the first cartridge in a multi cartridge system.
//
// The need for this behavior was identified by Tafoid when the following command line
@@ -647,9 +647,9 @@ bool emu_options::add_and_remove_image_options()
// first, create a list of existing image options; this is so we can purge
// any stray slot options that are no longer pertinent when we're done; we
// have to do this for both "flavors" of name
- existing_option_tracker<::image_option> existing(m_image_options_cannonical);
+ existing_option_tracker<::image_option> existing(m_image_options_canonical);
- // wipe the non-cannonical image options; we're going to rebuild it
+ // wipe the non-canonical image options; we're going to rebuild it
m_image_options.clear();
// it is perfectly legal for this to be called without a system; we
@@ -662,19 +662,19 @@ bool emu_options::add_and_remove_image_options()
// iterate through all image devices
for (device_image_interface &image : image_interface_iterator(config.root_device()))
{
- const std::string &cannonical_name(image.cannonical_instance_name());
+ const std::string &canonical_name(image.canonical_instance_name());
// erase this option from existing (so we don't purge it later)
- existing.remove(cannonical_name);
+ existing.remove(canonical_name);
// do we need to add this option?
- auto iter = m_image_options_cannonical.find(cannonical_name);
- ::image_option *this_option = iter != m_image_options_cannonical.end() ? &iter->second : nullptr;
+ auto iter = m_image_options_canonical.find(canonical_name);
+ ::image_option *this_option = iter != m_image_options_canonical.end() ? &iter->second : nullptr;
if (!this_option)
{
- // we do - add it to both m_image_options_cannonical and m_image_options
- auto pair = std::make_pair(cannonical_name, ::image_option(*this, image.cannonical_instance_name()));
- this_option = &m_image_options_cannonical.emplace(std::move(pair)).first->second;
+ // we do - add it to both m_image_options_canonical and m_image_options
+ auto pair = std::make_pair(canonical_name, ::image_option(*this, image.canonical_instance_name()));
+ this_option = &m_image_options_canonical.emplace(std::move(pair)).first->second;
changed = true;
// if this image is user loadable, we have to surface it in the core_options
@@ -704,15 +704,15 @@ bool emu_options::add_and_remove_image_options()
// at this point we need to purge stray image options that may no longer be pertinent
for (auto &opt_name : existing)
{
- auto iter = m_image_options_cannonical.find(*opt_name);
- assert(iter != m_image_options_cannonical.end());
+ auto iter = m_image_options_canonical.find(*opt_name);
+ assert(iter != m_image_options_canonical.end());
// if this is represented in core_options, remove it
if (iter->second.option_entry())
remove_entry(*iter->second.option_entry());
// remove this option
- m_image_options_cannonical.erase(iter);
+ m_image_options_canonical.erase(iter);
changed = true;
}
@@ -1233,9 +1233,9 @@ core_options::entry::shared_ptr slot_option::setup_option_entry(const char *name
// image_option ctor
//-------------------------------------------------
-image_option::image_option(emu_options &host, const std::string &cannonical_instance_name)
+image_option::image_option(emu_options &host, const std::string &canonical_instance_name)
: m_host(host)
- , m_canonical_instance_name(cannonical_instance_name)
+ , m_canonical_instance_name(canonical_instance_name)
{
}
diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h
index 0e66f8f84d7..1036d3c3e06 100644
--- a/src/emu/emuopts.h
+++ b/src/emu/emuopts.h
@@ -511,7 +511,7 @@ private:
// slots and devices
std::unordered_map<std::string, ::slot_option> m_slot_options;
- std::unordered_map<std::string, ::image_option> m_image_options_cannonical;
+ std::unordered_map<std::string, ::image_option> m_image_options_canonical;
std::unordered_map<std::string, ::image_option *> m_image_options;
// cached options, for scenarios where parsing core_options is too slow
diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp
index 474bf9db589..816af2dccfd 100644
--- a/src/lib/formats/cassimg.cpp
+++ b/src/lib/formats/cassimg.cpp
@@ -725,7 +725,7 @@ cassette_image::error cassette_put_modulated_data(cassette_image *cassette, int
b = *(data_bytes++);
for (i = 0; i < 8; i++)
{
- pulse_frequency = (b & (1 << i)) ? modulation->one_frequency_cannonical : modulation->zero_frequency_cannonical;
+ pulse_frequency = (b & (1 << i)) ? modulation->one_frequency_canonical : modulation->zero_frequency_canonical;
pulse_period = 1 / pulse_frequency;
err = cassette_put_samples(cassette, 0, time_index, pulse_period, wave_bytes_length, 1, wave_bytes, CASSETTE_WAVEFORM_8BIT);
if (err != cassette_image::error::SUCCESS)
@@ -836,7 +836,7 @@ cassette_image::error cassette_put_modulated_data_bit(cassette_image *cassette,
wave_bytes = choose_wave(modulation, &wave_bytes_length);
- pulse_frequency = (data) ? modulation->one_frequency_cannonical : modulation->zero_frequency_cannonical;
+ pulse_frequency = (data) ? modulation->one_frequency_canonical : modulation->zero_frequency_canonical;
pulse_period = 1 / pulse_frequency;
err = cassette_put_samples(cassette, 0, time_index, pulse_period, wave_bytes_length, 1, wave_bytes, CASSETTE_WAVEFORM_8BIT);
if (err != cassette_image::error::SUCCESS)
diff --git a/src/lib/formats/cassimg.h b/src/lib/formats/cassimg.h
index 9ac2dad988b..5199c0e4a04 100644
--- a/src/lib/formats/cassimg.h
+++ b/src/lib/formats/cassimg.h
@@ -124,10 +124,10 @@ struct CassetteModulation
{
int flags;
double zero_frequency_low;
- double zero_frequency_cannonical;
+ double zero_frequency_canonical;
double zero_frequency_high;
double one_frequency_low;
- double one_frequency_cannonical;
+ double one_frequency_canonical;
double one_frequency_high;
};
diff --git a/src/lib/util/options.h b/src/lib/util/options.h
index 660ab9acdfa..3fcd9d5e144 100644
--- a/src/lib/util/options.h
+++ b/src/lib/util/options.h
@@ -248,7 +248,7 @@ private:
void throw_options_exception_if_appropriate(condition_type condition, std::ostringstream &error_stream);
// internal state
- std::vector<entry::shared_ptr> m_entries; // cannonical list of entries
+ std::vector<entry::shared_ptr> m_entries; // canonical list of entries
std::unordered_map<std::string, entry::weak_ptr> m_entrymap; // map for fast lookup
std::string m_command; // command found
std::vector<std::string> m_command_arguments; // command arguments
diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp
index e04281cd98e..d8e90de11ff 100644
--- a/src/lib/util/zippath.cpp
+++ b/src/lib/util/zippath.cpp
@@ -867,7 +867,7 @@ done:
revised_path.clear();
if (filerr == osd_file::error::NONE)
{
- /* cannonicalize mainpath */
+ /* canonicalize mainpath */
std::string alloc_fullpath;
filerr = osd_get_full_path(alloc_fullpath, mainpath);
if (filerr == osd_file::error::NONE)
diff --git a/src/mame/video/gime.cpp b/src/mame/video/gime.cpp
index db8265c0b89..ef50d27473e 100644
--- a/src/mame/video/gime.cpp
+++ b/src/mame/video/gime.cpp
@@ -454,7 +454,7 @@ void gime_device::reset_timer(void)
/* value is from 0-4095 */
m_timer_value = ((m_gime_registers[0x04] & 0x0F) * 0x100) | m_gime_registers[0x05];
- /* depending on the GIME type, cannonicalize the value */
+ /* depending on the GIME type, canonicalize the value */
if (m_timer_value > 0)
{
if (GIME_TYPE_1987)
diff --git a/src/osd/modules/file/winfile.cpp b/src/osd/modules/file/winfile.cpp
index 66281d08b4a..5df7c4bb8b1 100644
--- a/src/osd/modules/file/winfile.cpp
+++ b/src/osd/modules/file/winfile.cpp
@@ -402,7 +402,7 @@ osd_file::error osd_get_full_path(std::string &dst, std::string const &path)
// convert the path to TCHARs
osd::text::tstring t_path = osd::text::to_tstring(path);
- // cannonicalize the path
+ // canonicalize the path
TCHAR buffer[MAX_PATH];
if (!GetFullPathName(t_path.c_str(), ARRAY_LENGTH(buffer), buffer, nullptr))
return win_error_to_file_error(GetLastError());
diff --git a/src/osd/modules/file/winrtfile.cpp b/src/osd/modules/file/winrtfile.cpp
index 2e561aa32a9..83d8d7c4915 100644
--- a/src/osd/modules/file/winrtfile.cpp
+++ b/src/osd/modules/file/winrtfile.cpp
@@ -348,7 +348,7 @@ osd_file::error osd_get_full_path(std::string &dst, std::string const &path)
// convert the path to TCHARs
osd::text::tstring t_path = osd::text::to_tstring(path);
- // cannonicalize the path
+ // canonicalize the path
TCHAR buffer[MAX_PATH];
if (!GetFullPathName(t_path.c_str(), ARRAY_LENGTH(buffer), buffer, nullptr))
return win_error_to_file_error(GetLastError());
diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp
index 67283ce8fa3..b51d7b4d478 100644
--- a/src/tools/imgtool/imgtool.cpp
+++ b/src/tools/imgtool/imgtool.cpp
@@ -151,7 +151,7 @@ static void internal_error(const imgtool_module *module, const char *message)
void imgtool_init(bool omit_untested, void (*warn)(const char *message))
{
imgtoolerr_t err;
- err = imgtool_create_cannonical_library(omit_untested, global_imgtool_library);
+ err = imgtool_create_canonical_library(omit_untested, global_imgtool_library);
assert(err == IMGTOOLERR_SUCCESS);
if (err == IMGTOOLERR_SUCCESS)
{
@@ -1165,11 +1165,11 @@ std::string imgtool::image::info()
#define PATH_CANBEBOOTBLOCK 0x00000004
//-------------------------------------------------
-// partition::cannonicalize_path - normalizes a path string
+// partition::canonicalize_path - normalizes a path string
// into a NUL delimited list
//-------------------------------------------------
-imgtoolerr_t imgtool::partition::cannonicalize_path(uint32_t flags, const char *path, std::string &result)
+imgtoolerr_t imgtool::partition::canonicalize_path(uint32_t flags, const char *path, std::string &result)
{
imgtoolerr_t err = (imgtoolerr_t)IMGTOOLERR_SUCCESS;
@@ -1216,7 +1216,7 @@ imgtoolerr_t imgtool::partition::cannonicalize_path(uint32_t flags, const char *
{
const char *s = path ? path : "";
- // allocate space for a new cannonical path
+ // allocate space for a new canonical path
std::ostringstream stream;
// copy the path
@@ -1245,10 +1245,10 @@ imgtoolerr_t imgtool::partition::cannonicalize_path(uint32_t flags, const char *
//-------------------------------------------------
-// partition::cannonicalize_fork
+// partition::canonicalize_fork
//-------------------------------------------------
-imgtoolerr_t imgtool::partition::cannonicalize_fork(const char **fork)
+imgtoolerr_t imgtool::partition::canonicalize_fork(const char **fork)
{
// does this module support forks?
if (m_list_forks)
@@ -1364,13 +1364,13 @@ imgtoolerr_t imgtool::partition::list_file_attributes(const char *path, uint32_t
if (!m_list_attrs)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_LEAVENULLALONE, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_LEAVENULLALONE, path, canonical_path);
if (err)
return err;
- err = m_list_attrs(*this, cannonical_path.c_str(), attrs, len);
+ err = m_list_attrs(*this, canonical_path.c_str(), attrs, len);
if (err)
return err;
@@ -1389,13 +1389,13 @@ imgtoolerr_t imgtool::partition::get_file_attributes(const char *path, const uin
if (!m_get_attrs)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_LEAVENULLALONE, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_LEAVENULLALONE, path, canonical_path);
if (err)
return err;
- err = m_get_attrs(*this, cannonical_path.c_str(), attrs, values);
+ err = m_get_attrs(*this, canonical_path.c_str(), attrs, values);
if (err)
return err;
@@ -1414,13 +1414,13 @@ imgtoolerr_t imgtool::partition::put_file_attributes(const char *path, const uin
if (!m_set_attrs)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_LEAVENULLALONE, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_LEAVENULLALONE, path, canonical_path);
if (err)
return err;
- err = m_set_attrs(*this, cannonical_path.c_str(), attrs, values);
+ err = m_set_attrs(*this, canonical_path.c_str(), attrs, values);
if (err)
return err;
@@ -1467,14 +1467,14 @@ imgtoolerr_t imgtool::partition::get_icon_info(const char *path, imgtool_iconinf
if (!m_get_iconinfo)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(0, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(0, path, canonical_path);
if (err)
return err;
memset(iconinfo, 0, sizeof(*iconinfo));
- err = m_get_iconinfo(*this, cannonical_path.c_str(), iconinfo);
+ err = m_get_iconinfo(*this, canonical_path.c_str(), iconinfo);
if (err)
return err;
@@ -1502,14 +1502,14 @@ imgtoolerr_t imgtool::partition::suggest_file_filters(const char *path,
if (!m_suggest_transfer)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_LEAVENULLALONE, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_LEAVENULLALONE, path, canonical_path);
if (err)
return err;
// invoke the module's suggest call
- err = m_suggest_transfer(*this, cannonical_path.c_str(), suggestions, suggestions_length);
+ err = m_suggest_transfer(*this, canonical_path.c_str(), suggestions, suggestions_length);
if (err)
return err;
@@ -1699,18 +1699,18 @@ imgtoolerr_t imgtool::partition::read_file(const char *filename, const char *for
}
else
{
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_CANBEBOOTBLOCK, filename, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_CANBEBOOTBLOCK, filename, canonical_path);
if (err)
return err;
- err = cannonicalize_fork(&fork);
+ err = canonicalize_fork(&fork);
if (err)
return err;
// invoke the actual module
- err = m_read_file(*this, cannonical_path.c_str(), fork, destf);
+ err = m_read_file(*this, canonical_path.c_str(), fork, destf);
if (err)
return markerrorsource(err);
}
@@ -1769,13 +1769,13 @@ imgtoolerr_t imgtool::partition::write_file(const char *filename, const char *fo
filename = ucase_str.c_str();
}
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_CANBEBOOTBLOCK, filename, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_CANBEBOOTBLOCK, filename, canonical_path);
if (err)
return err;
- err = cannonicalize_fork(&fork);
+ err = canonicalize_fork(&fork);
if (err)
return err;
@@ -1806,7 +1806,7 @@ imgtoolerr_t imgtool::partition::write_file(const char *filename, const char *fo
}
// actually invoke the write file handler
- err = m_write_file(*this, cannonical_path.c_str(), fork, sourcef, opts);
+ err = m_write_file(*this, canonical_path.c_str(), fork, sourcef, opts);
if (err)
return markerrorsource(err);
}
@@ -1924,13 +1924,13 @@ imgtoolerr_t imgtool::partition::delete_file(const char *fname)
if (!m_delete_file)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(0, fname, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(0, fname, canonical_path);
if (err)
return err;
- err = m_delete_file(*this, cannonical_path.c_str());
+ err = m_delete_file(*this, canonical_path.c_str());
if (err)
return markerrorsource(err);
@@ -1949,15 +1949,15 @@ imgtoolerr_t imgtool::partition::list_file_forks(const char *path, std::vector<i
if (!m_list_forks)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(0, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(0, path, canonical_path);
if (err)
return err;
// call the callback
forks.clear();
- err = m_list_forks(*this, cannonical_path.c_str(), forks);
+ err = m_list_forks(*this, canonical_path.c_str(), forks);
if (err)
return err;
@@ -1978,9 +1978,9 @@ imgtoolerr_t imgtool::partition::create_directory(const char *path)
if (!m_create_dir)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_MUSTBEDIR, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_MUSTBEDIR, path, canonical_path);
if (err)
return err;
@@ -2005,9 +2005,9 @@ imgtoolerr_t imgtool::partition::delete_directory(const char *path)
if (!m_delete_dir)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- // cannonicalize path
- std::string cannonical_path;
- err = cannonicalize_path(PATH_MUSTBEDIR, path, cannonical_path);
+ // canonicalize path
+ std::string canonical_path;
+ err = canonicalize_path(PATH_MUSTBEDIR, path, canonical_path);
if (err)
return err;
@@ -2296,8 +2296,8 @@ imgtoolerr_t imgtool::directory::open(imgtool::partition &partition, const std::
if (!partition.m_next_enum)
return imgtoolerr_t(IMGTOOLERR_UNIMPLEMENTED | IMGTOOLERR_SRC_FUNCTIONALITY);
- std::string cannonical_path;
- err = partition.cannonicalize_path(PATH_MUSTBEDIR, path.c_str(), cannonical_path);
+ std::string canonical_path;
+ err = partition.canonicalize_path(PATH_MUSTBEDIR, path.c_str(), canonical_path);
if (err)
return err;
@@ -2309,7 +2309,7 @@ imgtoolerr_t imgtool::directory::open(imgtool::partition &partition, const std::
if (partition.m_begin_enum)
{
- err = partition.m_begin_enum(*enumeration, cannonical_path.c_str());
+ err = partition.m_begin_enum(*enumeration, canonical_path.c_str());
if (err)
return markerrorsource(err);
}
diff --git a/src/tools/imgtool/imgtool.h b/src/tools/imgtool/imgtool.h
index 1a63ccd2399..aa4ae79e29e 100644
--- a/src/tools/imgtool/imgtool.h
+++ b/src/tools/imgtool/imgtool.h
@@ -226,8 +226,8 @@ namespace imgtool
std::unique_ptr<uint8_t[]> m_extra_bytes;
// methods
- imgtoolerr_t cannonicalize_path(uint32_t flags, const char *path, std::string &result);
- imgtoolerr_t cannonicalize_fork(const char **fork);
+ imgtoolerr_t canonicalize_path(uint32_t flags, const char *path, std::string &result);
+ imgtoolerr_t canonicalize_fork(const char **fork);
imgtoolerr_t map_block_to_image_block(uint64_t partition_block, uint64_t &image_block) const;
};
diff --git a/src/tools/imgtool/modules.cpp b/src/tools/imgtool/modules.cpp
index 35b31a38be0..1c573e3bcc9 100644
--- a/src/tools/imgtool/modules.cpp
+++ b/src/tools/imgtool/modules.cpp
@@ -26,8 +26,8 @@ static void (*const modules[])(const imgtool_class *imgclass, uint32_t state, un
#include "modules.cpp"
};
-/* step 3: declare imgtool_create_cannonical_library() */
-imgtoolerr_t imgtool_create_cannonical_library(bool omit_untested, std::unique_ptr<imgtool::library> &library)
+/* step 3: declare imgtool_create_canonical_library() */
+imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_ptr<imgtool::library> &library)
{
size_t i;
diff --git a/src/tools/imgtool/modules.h b/src/tools/imgtool/modules.h
index 9950e39857a..d58b5af008c 100644
--- a/src/tools/imgtool/modules.h
+++ b/src/tools/imgtool/modules.h
@@ -13,6 +13,6 @@
#include "library.h"
-imgtoolerr_t imgtool_create_cannonical_library(bool omit_untested, std::unique_ptr<imgtool::library> &library);
+imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_ptr<imgtool::library> &library);
#endif /* MODULES_H */
diff --git a/src/tools/imgtool/modules/fat.cpp b/src/tools/imgtool/modules/fat.cpp
index 057a5c68770..029050d1e9c 100644
--- a/src/tools/imgtool/modules/fat.cpp
+++ b/src/tools/imgtool/modules/fat.cpp
@@ -1211,7 +1211,7 @@ static void fat_calc_dirent_lfnchecksum(uint8_t *entry, size_t entry_len)
-static char fat_cannonicalize_sfn_char(char ch)
+static char fat_canonicalize_sfn_char(char ch)
{
/* return the display version of this short file name character */
return tolower(ch);
@@ -1219,7 +1219,7 @@ static char fat_cannonicalize_sfn_char(char ch)
-static void fat_cannonicalize_sfn(char *sfn, const uint8_t *sfn_bytes)
+static void fat_canonicalize_sfn(char *sfn, const uint8_t *sfn_bytes)
{
/* return the display version of this short file name */
int i;
@@ -1236,7 +1236,7 @@ static void fat_cannonicalize_sfn(char *sfn, const uint8_t *sfn_bytes)
rtrim(sfn);
}
for (i = 0; sfn[i]; i++)
- sfn[i] = fat_cannonicalize_sfn_char(sfn[i]);
+ sfn[i] = fat_canonicalize_sfn_char(sfn[i]);
}
@@ -1360,7 +1360,7 @@ static imgtoolerr_t fat_read_dirent(imgtool::partition &partition, fat_file *fil
}
/* pick apart short filename */
- fat_cannonicalize_sfn(ent.short_filename, entry);
+ fat_canonicalize_sfn(ent.short_filename, entry);
/* and the long filename */
if (lfn_lastentry == 1)
@@ -1411,7 +1411,7 @@ static imgtoolerr_t fat_construct_dirent(const char *filename, creation_policy_t
char32_t ch;
char last_short_char = ' ';
char short_char = '\0';
- char cannonical_short_char;
+ char canonical_short_char;
char16_t buf[UTF16_CHAR_MAX];
int i, len;
int sfn_pos = 0;
@@ -1457,10 +1457,10 @@ static imgtoolerr_t fat_construct_dirent(const char *filename, creation_policy_t
short_char = (char) ch;
else
short_char = '\0'; /* illegal SFN char */
- cannonical_short_char = fat_cannonicalize_sfn_char((char) ch);
- if (!short_char || (short_char != cannonical_short_char))
+ canonical_short_char = fat_canonicalize_sfn_char((char) ch);
+ if (!short_char || (short_char != canonical_short_char))
{
- if (toupper(short_char) == toupper(cannonical_short_char))
+ if (toupper(short_char) == toupper(canonical_short_char))
sfn_disposition = std::max(sfn_disposition, SFN_DERIVATIVE);
else
sfn_disposition = SFN_MANGLED;
@@ -1732,7 +1732,7 @@ static imgtoolerr_t fat_lookup_path(imgtool::partition &partition, const char *p
goto done;
bumped_sfn = false;
- fat_cannonicalize_sfn(sfn, &created_entry[created_entry_len - FAT_DIRENT_SIZE]);
+ fat_canonicalize_sfn(sfn, &created_entry[created_entry_len - FAT_DIRENT_SIZE]);
do
{
@@ -1744,7 +1744,7 @@ static imgtoolerr_t fat_lookup_path(imgtool::partition &partition, const char *p
{
bumped_sfn = true;
fat_bump_dirent(partition, created_entry, created_entry_len);
- fat_cannonicalize_sfn(sfn, &created_entry[created_entry_len - FAT_DIRENT_SIZE]);
+ fat_canonicalize_sfn(sfn, &created_entry[created_entry_len - FAT_DIRENT_SIZE]);
}
}
while(!ent.eof);