From a729e0047c192e554fab2ee9823e557acdd979c3 Mon Sep 17 00:00:00 2001
From: henri <henri@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 22 Apr 2013 19:34:58 +0000
Subject: [PATCH] Reworked expression for readability.

---
 nsock/src/nsock_proxy.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nsock/src/nsock_proxy.c b/nsock/src/nsock_proxy.c
index a109c7df6..db6036efa 100644
--- a/nsock/src/nsock_proxy.c
+++ b/nsock/src/nsock_proxy.c
@@ -61,6 +61,8 @@
 #include <netdb.h>
 #include <string.h>
 
+#define IN_RANGE(x, min, max) ((x) >= (min) && (x) <= (max))
+
 
 struct proxy_parser {
   int done;
@@ -285,7 +287,7 @@ static int uri_parse_authority(const char *authority, struct uri *uri) {
 
     errno = 0;
     n = parse_long(portsep + 1, &tail);
-    if (errno != 0 || *tail != '\0' || tail == portsep + 1 || n < 1 || n > 65535)
+    if (errno || *tail || (tail == (portsep + 1)) || !IN_RANGE(n, 1, 65535))
       return -1;
     uri->port = n;
   } else {