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

Add braces to C++ single-line loops and conditionals (NFC) (#2973)

Browse Source 
This makes code easier to read and more consistent between C++ and Java.
Also update clang-format settings to always add a line break (even if no braces are used).
This commit is contained in:
Peter Johnson
2020-12-28 12:58:06 -08:00
committed by GitHub
parent 0291a3ff56
commit 2aed432b4b
634 changed files with 10716 additions and 3938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wpiutil/src/main/native/cpp/UDPClient.cpp
View File

@@ -41,7 +41,9 @@ UDPClient::~UDPClient() {
}
UDPClient& UDPClient::operator=(UDPClient&& other) {
if (this == &other) return *this;
if (this == &other) {
return *this;
}
shutdown();
m_logger = other.m_logger;
m_lsd = other.m_lsd;
@@ -52,10 +54,14 @@ UDPClient& UDPClient::operator=(UDPClient&& other) {
return *this;
}
int UDPClient::start() { return start(0); }
int UDPClient::start() {
return start(0);
}
int UDPClient::start(int port) {
if (m_lsd > 0) return 0;
if (m_lsd > 0) {
return 0;
}
#ifdef _WIN32
WSAData wsaData;
@@ -186,14 +192,18 @@ int UDPClient::send(StringRef data, const Twine& server, int port) {
}
int UDPClient::receive(uint8_t* data_received, int receive_len) {
if (m_port == 0) return -1; // return if not receiving
if (m_port == 0) {
return -1; // return if not receiving
}
return recv(m_lsd, reinterpret_cast<char*>(data_received), receive_len, 0);
}
int UDPClient::receive(uint8_t* data_received, int receive_len,
SmallVectorImpl<char>* addr_received,
int* port_received) {
if (m_port == 0) return -1; // return if not receiving
if (m_port == 0) {
return -1; // return if not receiving
}
struct sockaddr_in remote;
socklen_t remote_len = sizeof(remote);
@@ -222,13 +232,17 @@ int UDPClient::receive(uint8_t* data_received, int receive_len,
}
int UDPClient::set_timeout(double timeout) {
if (timeout < 0) return -1;
if (timeout < 0) {
return -1;
}
struct timeval tv;
tv.tv_sec = timeout; // truncating will give seconds
timeout -= tv.tv_sec; // remove seconds portion
tv.tv_usec = timeout * 1000000; // fractions of a second to us
int ret = setsockopt(m_lsd, SOL_SOCKET, SO_RCVTIMEO,
reinterpret_cast<char*>(&tv), sizeof(tv));
if (ret < 0) WPI_ERROR(m_logger, "set timeout failed");
if (ret < 0) {
WPI_ERROR(m_logger, "set timeout failed");
}
return ret;
}