diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 23729949..ee84e57d 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -25,6 +25,7 @@ The full set of tests is only run for tagged releases. ### Summary - use vivado 2019.1 as default +- finalize coverity fixups, now defect free ### New features - new tools diff --git a/tools/src/librlink/RlinkPacketBufRcv.cpp b/tools/src/librlink/RlinkPacketBufRcv.cpp index ce18c811..b74f34a5 100644 --- a/tools/src/librlink/RlinkPacketBufRcv.cpp +++ b/tools/src/librlink/RlinkPacketBufRcv.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkPacketBufRcv.cpp 1091 2018-12-23 12:38:29Z mueller $ +// $Id: RlinkPacketBufRcv.cpp 1163 2019-06-15 07:26:57Z mueller $ // -// Copyright 2014-2018 by Walter F.J. Mueller +// Copyright 2014-2019 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2019-06-14 1163 1.2.2 ReadData(): coverity fixup (logically dead code) // 2018-12-23 1091 1.2.1 ReadData(): remove port open check, done at caller // 2018-12-08 1079 1.2 use ref not ptr for RlinkPort // 2017-04-07 868 1.1.1 Dump(): add detail arg @@ -92,7 +93,7 @@ int RlinkPacketBufRcv::ReadData(RlinkPort& port, const Rtime& timeout, if (timeout.IsZero() && irc == RlinkPort::kTout) return 0; - if (irc < 0) { + if (irc <= 0) { if (irc == RlinkPort::kTout) { SetFlagBit(kFlagErrTout); } else { diff --git a/tools/src/librtools/Rfd.cpp b/tools/src/librtools/Rfd.cpp index 2f228dc1..11f503e2 100644 --- a/tools/src/librtools/Rfd.cpp +++ b/tools/src/librtools/Rfd.cpp @@ -1,4 +1,4 @@ -// $Id: Rfd.cpp 1161 2019-06-08 11:52:01Z mueller $ +// $Id: Rfd.cpp 1163 2019-06-15 07:26:57Z mueller $ // // Copyright 2019- by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2019-06-15 1163 1.0.1 SetFd() now type bool // 2019-06-07 1161 1.0 Initial version // --------------------------------------------------------------------------- @@ -76,12 +77,12 @@ Rfd::~Rfd() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rfd::SetFd(int fd) +bool Rfd::SetFd(int fd) { if (IsOpen()) throw Rexception(fCnam+"Open()", "bad state: already open"); fFd = fd; - return; + return IsOpen(); } //------------------------------------------+----------------------------------- diff --git a/tools/src/librtools/Rfd.hpp b/tools/src/librtools/Rfd.hpp index 548d5a1e..f3e6da1a 100644 --- a/tools/src/librtools/Rfd.hpp +++ b/tools/src/librtools/Rfd.hpp @@ -1,4 +1,4 @@ -// $Id: Rfd.hpp 1161 2019-06-08 11:52:01Z mueller $ +// $Id: Rfd.hpp 1163 2019-06-15 07:26:57Z mueller $ // // Copyright 2019- by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2019-06-15 1163 1.0.1 SetFd() now type bool // 2019-06-07 1161 1.0 Initial version // --------------------------------------------------------------------------- @@ -40,7 +41,7 @@ namespace Retro { Rfd(const Rfd&) = delete; // noncopyable Rfd& operator=(const Rfd&) = delete; // noncopyable - void SetFd(int fd); + bool SetFd(int fd); int Fd() const; bool IsOpen() const; diff --git a/tools/src/librw11/Rw11CntlRHRP.cpp b/tools/src/librw11/Rw11CntlRHRP.cpp index 076ad901..902a1c00 100644 --- a/tools/src/librw11/Rw11CntlRHRP.cpp +++ b/tools/src/librw11/Rw11CntlRHRP.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11CntlRHRP.cpp 1133 2019-04-19 18:43:00Z mueller $ +// $Id: Rw11CntlRHRP.cpp 1163 2019-06-15 07:26:57Z mueller $ // // Copyright 2015-2019 by Walter F.J. Mueller // Other credits: @@ -589,6 +589,7 @@ void Rw11CntlRHRP::RdmaPostExecCB(int stat, size_t ndone, if (clist.Size() > ncmd) { uint8_t ccode = clist[ncmd].Command(); uint16_t cdata = clist[ncmd].Data(); + /* coverity[deadcode] */ /* unused until rper1 is really set */ if (ccode != RlinkCommand::kCmdLabo || (rper1 != 0 && cdata == 0)) throw Rexception("Rw11CntlRHRP::RdmaPostExecCB", "Bad state: Labo not found or missed abort");