Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix newer GCC/clang compiler warnings (#1718)

Browse Source
This commit is contained in:
Peter Johnson
2019-06-14 18:32:27 -07:00
committed by GitHub
parent 0120f31247
commit f07569df19
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cscore/src/main/native/linux/NetworkListener.cpp
View File

@@ -132,8 +132,9 @@ void NetworkListener::Impl::Thread::Main() {
break; // XXX: is this the right thing to do here?
}
if (len == 0) continue; // EOF?
unsigned int ulen = static_cast<unsigned int>(len);
for (struct nlmsghdr* nh = reinterpret_cast<struct nlmsghdr*>(buf);
NLMSG_OK(nh, len); nh = NLMSG_NEXT(nh, len)) {
NLMSG_OK(nh, ulen); nh = NLMSG_NEXT(nh, ulen)) {
if (nh->nlmsg_type == NLMSG_DONE) break;
if (nh->nlmsg_type == RTM_NEWLINK || nh->nlmsg_type == RTM_DELLINK ||
nh->nlmsg_type == RTM_NEWADDR || nh->nlmsg_type == RTM_DELADDR) {

6
cscore/src/main/native/linux/UsbCameraImpl.cpp
View File

@@ -448,7 +448,7 @@ void UsbCameraImpl::DeviceDisconnect() {
// Unmap buffers
for (int i = 0; i < kNumBuffers; ++i)
m_buffers[i] = std::move(UsbCameraBuffer{});
m_buffers[i] = UsbCameraBuffer{};
// Close device
close(fd);
@@ -534,11 +534,11 @@ void UsbCameraImpl::DeviceConnect() {
SDEBUG4("buf " << i << " length=" << buf.length
<< " offset=" << buf.m.offset);
m_buffers[i] = std::move(UsbCameraBuffer(fd, buf.length, buf.m.offset));
m_buffers[i] = UsbCameraBuffer(fd, buf.length, buf.m.offset);
if (!m_buffers[i].m_data) {
SWARNING("could not map buffer " << i);
// release other buffers
for (int j = 0; j < i; ++j) m_buffers[j] = std::move(UsbCameraBuffer{});
for (int j = 0; j < i; ++j) m_buffers[j] = UsbCameraBuffer{};
close(fd);
m_fd = -1;
return;