diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2013-08-02 15:10:20 +0200 |
---|---|---|
committer | Tobias Klauser <tklauser@distanz.ch> | 2013-08-02 15:12:29 +0200 |
commit | 98c15cbb658f226d52108ea2cb5b3bc27bc6a977 (patch) | |
tree | 74a1e2b730676a26ebf6ff9d6487e6dfc5ef012b /geoip.c | |
parent | c95c515fa9075443900734039cfd7f92b5ba832f (diff) |
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 <tklauser@distanz.ch>
Diffstat (limited to 'geoip.c')
-rw-r--r-- | geoip.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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; |