more things to make clang happy
diff --git a/aos/common/network/socket.cc b/aos/common/network/socket.cc
index 1448304..4f6687e 100644
--- a/aos/common/network/socket.cc
+++ b/aos/common/network/socket.cc
@@ -5,6 +5,7 @@
#include <sys/socket.h>
#include "aos/common/logging/logging.h"
+#include "aos/common/byteorder.h"
namespace aos {
namespace network {
@@ -19,7 +20,7 @@
memset(&addr_, 0, sizeof(addr_));
addr_.in.sin_family = AF_INET;
- addr_.in.sin_port = htons(static_cast<uint16_t>(port));
+ addr_.in.sin_port = hton<uint16_t>(static_cast<uint16_t>(port));
#ifndef __VXWORKS__
const int failure_return = 0;
#else
diff --git a/aos/common/util/inet_addr.cc b/aos/common/util/inet_addr.cc
index a83ecf9..f202f6e 100644
--- a/aos/common/util/inet_addr.cc
+++ b/aos/common/util/inet_addr.cc
@@ -5,6 +5,8 @@
#include <string.h>
#endif
+#include "aos/common/byteorder.h"
+
namespace aos {
namespace util {
@@ -23,8 +25,8 @@
}
void SetLastSegment(in_addr *address, ::aos::NetworkAddress last_segment) {
- address->s_addr &= ~(htonl(0xFF));
- address->s_addr |= htonl(static_cast<uint8_t>(last_segment));
+ address->s_addr &= ~(hton<uint32_t>(0xFF));
+ address->s_addr |= hton<uint32_t>(static_cast<uint8_t>(last_segment));
}
} // namespace util
diff --git a/aos/linux_code/starter/netconsole.cc b/aos/linux_code/starter/netconsole.cc
index fa4cd52..f624673 100644
--- a/aos/linux_code/starter/netconsole.cc
+++ b/aos/linux_code/starter/netconsole.cc
@@ -14,6 +14,7 @@
#include "aos/linux_code/configuration.h"
#include "aos/common/network_port.h"
#include "aos/linux_code/init.h"
+#include "aos/common/byteorder.h"
namespace aos {
namespace {
@@ -73,7 +74,7 @@
}
if (to_copy->source_address != nullptr) {
assert(header.msg_namelen >= sizeof(struct sockaddr_in));
- if (to_copy->source_address->sin_port != htons(0)) {
+ if (to_copy->source_address->sin_port != hton<uint16_t>(0)) {
if (sender_address.sin_port !=
to_copy->source_address->sin_port) {
good_data = false;
@@ -177,11 +178,11 @@
} address, crio_address;
address.in.sin_family = AF_INET;
- address.in.sin_port = htons(6666);
+ address.in.sin_port = hton<uint16_t>(6666);
address.in.sin_addr.s_addr = INADDR_ANY;
crio_address.in.sin_family = AF_INET;
- crio_address.in.sin_port = htons(0);
+ crio_address.in.sin_port = hton<uint16_t>(0);
crio_address.in.sin_addr = ::aos::configuration::GetOwnIPAddress();
::aos::util::SetLastSegment(&crio_address.in.sin_addr,
::aos::NetworkAddress::kCRIO);
@@ -208,7 +209,7 @@
LOG(FATAL, "SOL_SOCKET::SO_REUSEADDR=%d(%d) failed with %d: %s\n",
on, to_crio, errno, strerror(errno));
}
- address.in.sin_port = htons(6668);
+ address.in.sin_port = hton<uint16_t>(6668);
if (connect(to_crio, &address.addr, sizeof(address)) == -1) {
LOG(FATAL, "connect(%d, %p, %zu) failed with %d: %s\n",
to_crio, &address.addr, sizeof(address), errno, strerror(errno));
diff --git a/aos/prime/output/motor_output.h b/aos/prime/output/motor_output.h
index 65647c2..8c613e9 100644
--- a/aos/prime/output/motor_output.h
+++ b/aos/prime/output/motor_output.h
@@ -6,10 +6,10 @@
#include <algorithm>
#include <string>
+#include "aos/externals/WPILib/WPILib/NetworkRobot/NetworkRobotValues.h"
#include "aos/common/network/send_socket.h"
#include "aos/common/byteorder.h"
#include "aos/common/type_traits.h"
-#include "aos/externals/WPILib/WPILib/NetworkRobot/NetworkRobotValues.h"
namespace aos {
diff --git a/frc971/input/hot_goal_reader.cc b/frc971/input/hot_goal_reader.cc
index cc6edfc..4bf5198 100644
--- a/frc971/input/hot_goal_reader.cc
+++ b/frc971/input/hot_goal_reader.cc
@@ -9,6 +9,7 @@
#include "aos/common/logging/queue_logging.h"
#include "aos/common/logging/logging.h"
#include "aos/linux_code/init.h"
+#include "aos/common/byteorder.h"
#include "frc971/queues/hot_goal.q.h"
@@ -39,7 +40,7 @@
sockaddr_in address, *sockaddr_pointer;
memset(&address, 0, sizeof(address));
address.sin_family = AF_INET;
- address.sin_port = htons(1180);
+ address.sin_port = ::aos::hton<uint16_t>(1180);
sockaddr *address_pointer;
sockaddr_pointer = &address;
memcpy(&address_pointer, &sockaddr_pointer, sizeof(void *));