summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/imgtool/modules/fat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/imgtool/modules/fat.cpp')
-rw-r--r--src/tools/imgtool/modules/fat.cpp20
1 files changed, 10 insertions, 10 deletions
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);