From bedd34e3fe4d92162661a35bf94a31af2079bef5 Mon Sep 17 00:00:00 2001
From: Marco d'Itri <md@linux.it>
Date: Sat, 7 Oct 2023 10:50:10 +0200
Subject: [PATCH] Refactoring

---
 whois.c | 25 +++++++++----------------
 whois.h |  1 -
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/whois.c b/whois.c
index aa25f63..82b4104 100644
--- a/whois.c
+++ b/whois.c
@@ -599,26 +599,19 @@ char *guess_server(const char *s)
     return strdup("\x05");
 }
 
-const char *whereas32(const unsigned long asn)
-{
-    int i;
-
-    for (i = 0; as32_assign[i].serv; i++)
-	if (asn >= as32_assign[i].first && asn <= as32_assign[i].last)
-	    return as32_assign[i].serv;
-    return "\x06";
-}
-
 const char *whereas(const unsigned long asn)
 {
     int i;
 
-    if (asn > 65535)
-	return whereas32(asn);
-
-    for (i = 0; as_assign[i].serv; i++)
-	if (asn >= as_assign[i].first && asn <= as_assign[i].last)
-	    return as_assign[i].serv;
+    if (asn > 65535) {
+	for (i = 0; as32_assign[i].serv; i++)
+	    if (asn >= as32_assign[i].first && asn <= as32_assign[i].last)
+		return as32_assign[i].serv;
+    } else {
+	for (i = 0; as_assign[i].serv; i++)
+	    if (asn >= as_assign[i].first && asn <= as_assign[i].last)
+		return as_assign[i].serv;
+    }
     return "\x06";
 }
 
diff --git a/whois.h b/whois.h
index 56275f0..248cefb 100644
--- a/whois.h
+++ b/whois.h
@@ -12,7 +12,6 @@
 char *guess_server(const char *);
 const char *match_config_file(const char *);
 const char *whereas(const unsigned long);
-const char *whereas32(const unsigned long);
 char *queryformat(const char *, const char *, const char *);
 int hide_line(int *hiding, const char *const line);
 char *do_query(const int, const char *);