From fd842e5b3b917a5ce83b13f467c21d2a7d0423af Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Tue, 8 Jan 2019 13:07:13 +1100 Subject: Fix uninitialized value bug with clang builds && fix all warnings --- ptfformat.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ptfformat.cc b/ptfformat.cc index aca6f10..4c35e3f 100644 --- a/ptfformat.cc +++ b/ptfformat.cc @@ -548,7 +548,7 @@ PTFFormat::parserest5(void) { uint64_t startbytes, lengthbytes, offsetbytes, somethingbytes, skipbytes; uint16_t tracknumber = 0; uint16_t findex; - uint16_t rindex; + uint16_t rindex = 0; unsigned char tag1[3]; unsigned char tag2[3]; unsigned char tag3[3]; @@ -1167,7 +1167,7 @@ PTFFormat::parsemidi(void) { region_t r = { std::string(""), ridx, 0, 0, 0, w, m}; if ((mregion = std::find(begin, finish, r)) != finish) { mtr.reg = *mregion; - mtr.reg.startpos = labs(region_pos - mtr.reg.startpos); + mtr.reg.startpos = region_pos - mtr.reg.startpos; miditracks.push_back(mtr); } } @@ -1346,7 +1346,7 @@ PTFFormat::parsemidi12(void) { region_t r = { std::string(""), ridx, 0, 0, 0, w, m}; if ((mregion = std::find(begin, finish, r)) != finish) { mtr.reg = *mregion; - mtr.reg.startpos = labs(region_pos - mtr.reg.startpos); + mtr.reg.startpos = region_pos - mtr.reg.startpos; miditracks.push_back(mtr); } if (!jumpto(&k, ptfunxored, len, (const unsigned char *)"\xff\xff\xff\xff\xff\xff\xff\xff", 8)) { -- cgit v1.2.3