summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util
diff options
context:
space:
mode:
author mooglyguy <therealmogminer@gmail.com>2018-11-05 19:11:18 +0100
committer mooglyguy <therealmogminer@gmail.com>2018-11-05 19:11:18 +0100
commit13247311f650d2190ca50f05f2879c63a3ad0b6b (patch)
tree565cf81b012b0879a1ef304c955908ea016d2dc6 /src/lib/util
parent884465327b05bdbc0eae9894d4b84744a8ab5567 (diff)
Renamed flipendian -> swapendian, as I spent minutes trying to find the functions to tell to another person who spent minutes trying to find the functions, and we refer to such functions as swapping just about everywhere else in the codebase, nw
Diffstat (limited to 'src/lib/util')
-rw-r--r--src/lib/util/cdrom.cpp16
-rw-r--r--src/lib/util/unicode.cpp8
2 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp
index 1edd314cc61..c2cded9f9aa 100644
--- a/src/lib/util/cdrom.cpp
+++ b/src/lib/util/cdrom.cpp
@@ -1269,16 +1269,16 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
/* TODO: I don't know why sometimes the data is one endian and sometimes another */
if (toc->numtrks > CD_MAX_TRACKS)
{
- toc->numtrks = flipendian_int32(toc->numtrks);
+ toc->numtrks = swapendian_int32(toc->numtrks);
for (i = 0; i < CD_MAX_TRACKS; i++)
{
- toc->tracks[i].trktype = flipendian_int32(toc->tracks[i].trktype);
- toc->tracks[i].subtype = flipendian_int32(toc->tracks[i].subtype);
- toc->tracks[i].datasize = flipendian_int32(toc->tracks[i].datasize);
- toc->tracks[i].subsize = flipendian_int32(toc->tracks[i].subsize);
- toc->tracks[i].frames = flipendian_int32(toc->tracks[i].frames);
- toc->tracks[i].padframes = flipendian_int32(toc->tracks[i].padframes);
- toc->tracks[i].extraframes = flipendian_int32(toc->tracks[i].extraframes);
+ toc->tracks[i].trktype = swapendian_int32(toc->tracks[i].trktype);
+ toc->tracks[i].subtype = swapendian_int32(toc->tracks[i].subtype);
+ toc->tracks[i].datasize = swapendian_int32(toc->tracks[i].datasize);
+ toc->tracks[i].subsize = swapendian_int32(toc->tracks[i].subsize);
+ toc->tracks[i].frames = swapendian_int32(toc->tracks[i].frames);
+ toc->tracks[i].padframes = swapendian_int32(toc->tracks[i].padframes);
+ toc->tracks[i].extraframes = swapendian_int32(toc->tracks[i].extraframes);
}
}
diff --git a/src/lib/util/unicode.cpp b/src/lib/util/unicode.cpp
index bd0414a4612..5151a1e101d 100644
--- a/src/lib/util/unicode.cpp
+++ b/src/lib/util/unicode.cpp
@@ -198,9 +198,9 @@ int uchar_from_utf16f(char32_t *uchar, const char16_t *utf16char, size_t count)
{
char16_t buf[2] = {0};
if (count > 0)
- buf[0] = flipendian_int16(utf16char[0]);
+ buf[0] = swapendian_int16(utf16char[0]);
if (count > 1)
- buf[1] = flipendian_int16(utf16char[1]);
+ buf[1] = swapendian_int16(utf16char[1]);
return uchar_from_utf16(uchar, buf, count);
}
@@ -348,9 +348,9 @@ int utf16f_from_uchar(char16_t *utf16string, size_t count, char32_t uchar)
rc = utf16_from_uchar(buf, count, uchar);
if (rc >= 1)
- utf16string[0] = flipendian_int16(buf[0]);
+ utf16string[0] = swapendian_int16(buf[0]);
if (rc >= 2)
- utf16string[1] = flipendian_int16(buf[1]);
+ utf16string[1] = swapendian_int16(buf[1]);
return rc;
}