Fix compilation on 64-bit archs 86/129486/1
authorPiotr Sawicki <p.sawicki2@partner.samsung.com>
Tue, 16 May 2017 13:42:11 +0000 (15:42 +0200)
committerPiotr Sawicki <p.sawicki2@partner.samsung.com>
Tue, 16 May 2017 13:42:11 +0000 (15:42 +0200)
Change-Id: I7ded3027c4d1409f13c46d963fa964650f875c39

src/nether-tests/nether_tests.cpp

index ca14f38..dbfe746 100644 (file)
@@ -572,14 +572,14 @@ public:
         }
 
         struct sockaddr_in clntAddress;
-        size_t clntAddressLength = sizeof(clntAddress);
+        socklen_t clntAddressLength = static_cast<socklen_t>(sizeof(clntAddress));
         char receiveBuffer[NET_BUFFER_SIZE];
 
         notifyManager(pipeFd);
 
         while (true) {
             ssize_t len = TEMP_FAILURE_RETRY(recvfrom(sockFd, receiveBuffer, sizeof(receiveBuffer), 0,
-                    reinterpret_cast<struct sockaddr *>(&clntAddress), static_cast<socklen_t *>(&clntAddressLength)));
+                    reinterpret_cast<struct sockaddr *>(&clntAddress), &clntAddressLength));
 
             if (len == -1) {
                 exit(EXIT_FAILURE);
@@ -753,14 +753,14 @@ public:
         }
 
         struct sockaddr_in clntAddress;
-        size_t clntAddressLength = sizeof(clntAddress);
+        socklen_t clntAddressLength = static_cast<socklen_t>(sizeof(clntAddress));
         char receiveBuffer[NET_BUFFER_SIZE];
 
         notifyManager(pipeFd);
 
         while (true) {
             int acceptedSocketFd = TEMP_FAILURE_RETRY(accept(sockFd, reinterpret_cast<struct sockaddr *>(&clntAddress),
-                    static_cast<socklen_t *>(&clntAddressLength)));
+                    &clntAddressLength));
             if (acceptedSocketFd == -1) {
                 exit(EXIT_FAILURE);
             }