From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sun, 17 Oct 2010 05:24:33 +0000 (-0600)
Subject: EDNS: type mismatch on min() ssize_t / int
X-Git-Tag: take1~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9abd2b76ce847b89bd126af1a8bd09e2024a992e;p=thirdparty%2Fsquid.git

EDNS: type mismatch on min() ssize_t / int
---

diff --git a/lib/rfc2671.c b/lib/rfc2671.c
index 10f6eb1359..f33503138d 100644
--- a/lib/rfc2671.c
+++ b/lib/rfc2671.c
@@ -11,7 +11,7 @@ rfc2671RROptPack(char *buf, size_t sz, ssize_t edns_sz)
     // EDNS OPT record says only what our DNS buffer size is so far.
     snprintf(opt.name, RFC1035_MAXHOSTNAMESZ, ".");
     opt.type = RFC1035_TYPE_OPT;
-    opt._class = min(edns_sz, SQUID_UDP_SO_RCVBUF-1);
+    opt._class = min(edns_sz, (ssize_t)SQUID_UDP_SO_RCVBUF-1);
     opt.ttl = 0; // relevant?
     opt.rdata = NULL;
     opt.rdlength = 0;