From 98c15cbb658f226d52108ea2cb5b3bc27bc6a977 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 2 Aug 2013 15:10:20 +0200 Subject: built_in: Add min_t() and max_t() macros and use them Introduce non-typechecking versions of min_t() and max_t() and use them where a cast would be needed. The macros were taken from the Linux Kernel, release under GPL v2. Signed-off-by: Tobias Klauser --- geoip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'geoip.c') diff --git a/geoip.c b/geoip.c index d79236c..433dbbe 100644 --- a/geoip.c +++ b/geoip.c @@ -198,15 +198,15 @@ again: raw[sizeof(raw) - 1] = 0; for (i = 0; i < ret; i++) { - if (!strncmp(raw + i, "Content-Length: ", min((size_t)(ret - i), lenl))) { + if (!strncmp(raw + i, "Content-Length: ", min_t(size_t, ret - i, lenl))) { ptr = raw + i + lenl; rtotlen = strtoul(ptr, NULL, 10); } - if (!strncmp(raw + i, "HTTP/1.1 200 OK", min((size_t)(ret - i), lent))) + if (!strncmp(raw + i, "HTTP/1.1 200 OK", min_t(size_t, ret - i, lent))) good = 1; - if (!strncmp(raw + i, "\r\n\r\n", min((size_t)(ret - i), lenc))) { + if (!strncmp(raw + i, "\r\n\r\n", min_t(size_t, ret - i, lenc))) { ptr = raw + i + lenc; len = ret - i - lenc; found = 1; -- cgit v1.2.3-54-g00ecf