From 502631cfbff585ff0cbccbbc4b1f2e7c99475b0d Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 27 Apr 2013 20:19:56 +0100 Subject: [PATCH] compiler warning fix. --- modules/juce_core/network/juce_IPAddress.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/juce_core/network/juce_IPAddress.cpp b/modules/juce_core/network/juce_IPAddress.cpp index 2f6cda7bb3..4b7752fab0 100644 --- a/modules/juce_core/network/juce_IPAddress.cpp +++ b/modules/juce_core/network/juce_IPAddress.cpp @@ -98,10 +98,7 @@ static void findIPAddresses (int sock, Array& result) { ifconf cfg; HeapBlock buffer; - size_t bufferSize = 4096; - - const size_t ifreq_size_in = IFNAMSIZ + sizeof (struct sockaddr_in); - const size_t ifreq_size_in6 = IFNAMSIZ + sizeof (struct sockaddr_in6); + size_t bufferSize = 1024; do { @@ -114,10 +111,10 @@ static void findIPAddresses (int sock, Array& result) if (ioctl (sock, SIOCGIFCONF, &cfg) < 0 && errno != EINVAL) return; - } while (bufferSize < cfg.ifc_len + 2 * ifreq_size_in6); + } while (bufferSize < cfg.ifc_len + 2 * (IFNAMSIZ + sizeof (struct sockaddr_in6))); #if JUCE_MAC || JUCE_IOS - while (cfg.ifc_len >= (int) ifreq_size_in) + while (cfg.ifc_len >= (int) (IFNAMSIZ + sizeof (struct sockaddr_in))) { if (cfg.ifc_req->ifr_addr.sa_family == AF_INET) // Skip non-internet addresses addAddress ((const sockaddr_in*) &cfg.ifc_req->ifr_addr, result);