Remove useless vector copy

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 3b0c639315d1b9b95e9ee189d825be70c6c9abdf..c426f16e696ea8bdc7b163e228ae05168045b14c 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -61,7 +61,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 #endif
                }
        }
-       ret = SE->Bind(sockfd, &servaddr.sa, sizeof(servaddr));
+       ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
 
        if (ret < 0)
        {
@@ -117,11 +117,11 @@ int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
        }
        else
        {
-               setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+               setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
                /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
                linger.l_onoff = 1;
                linger.l_linger = 1;
-               setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger));
+               setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
                return (sockfd);
        }
 }
@@ -211,7 +211,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
        return bound;
 }
 
-int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
 {
        memset(sa, 0, sizeof(*sa));
        if (!addr || !*addr)
@@ -240,7 +240,7 @@ int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa
        return false;
 }
 
-int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+bool irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
        char addrv[INET6_ADDRSTRLEN+1];
        if (sa->sa.sa_family == AF_INET)
        {