From a7a5e51ff6003cccc77a5a689071cff2a21bcbaa Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 2 Jan 2016 12:04:22 +0100 Subject: [PATCH] fix for compiler warnings --- src/lib/ebus/device.cpp | 4 ++-- src/lib/utils/tcpsocket.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/ebus/device.cpp b/src/lib/ebus/device.cpp index b34a316b..9fc879bb 100644 --- a/src/lib/ebus/device.cpp +++ b/src/lib/ebus/device.cpp @@ -50,7 +50,7 @@ Device* Device::create(const char* name, const bool checkDevice, const bool read char* dup = strdup(name); char* pos = strchr(dup, ':'); result_t result = RESULT_OK; - unsigned long int port = parseInt(pos+1, 10, 1, 65535, result); + unsigned int port = parseInt(pos+1, 10, 1, 65535, result); if (result!=RESULT_OK) { free(dup); return NULL; // invalid port @@ -69,7 +69,7 @@ Device* Device::create(const char* name, const bool checkDevice, const bool read } free(dup); address.sin_family = AF_INET; - address.sin_port = htons((uint16_t)port); + address.sin_port = (in_port_t)htons((uint16_t)port); return new NetworkDevice(name, address, readonly, logRawFunc); } return new SerialDevice(name, checkDevice, readonly, logRawFunc); diff --git a/src/lib/utils/tcpsocket.cpp b/src/lib/utils/tcpsocket.cpp index 4d505933..15549dbe 100644 --- a/src/lib/utils/tcpsocket.cpp +++ b/src/lib/utils/tcpsocket.cpp @@ -30,7 +30,7 @@ TCPSocket::TCPSocket(int sfd, struct sockaddr_in* address) : m_sfd(sfd) char ip[17]; inet_ntop(AF_INET, (struct in_addr*)&(address->sin_addr.s_addr), ip, (socklen_t)sizeof(ip)-1); m_ip = ip; - m_port = ntohs(address->sin_port); + m_port = (uint16_t)ntohs(address->sin_port); } bool TCPSocket::isValid() @@ -65,7 +65,7 @@ TCPSocket* TCPClient::connect(const string& server, const uint16_t& port) } address.sin_family = AF_INET; - address.sin_port = htons(port); + address.sin_port = (in_port_t)htons(port); int sfd = socket(AF_INET, SOCK_STREAM, 0); if (sfd < 0) @@ -90,7 +90,7 @@ int TCPServer::start() memset(&address, 0, sizeof(address)); address.sin_family = AF_INET; - address.sin_port = htons(m_port); + address.sin_port = (in_port_t)htons(m_port); if (m_address.size() > 0) inet_pton(AF_INET, m_address.c_str(), &(address.sin_addr));