Merge 8383b69cb1bb347c88a3ed1f7b0a88b2399d089f into 54d60d8ebaf0034dc485a56bbb08f9f1356d7545

This commit is contained in:
Tim Rühsen 2026-07-30 16:26:09 -07:00 committed by GitHub
commit 46bcc3367f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 21 deletions

22
data.h
View File

@ -6,7 +6,7 @@
*/
/* servers which accept the new syntax (-V XXn.n) */
const char *ripe_servers[] = {
static const char *ripe_servers[] = {
"whois.ripe.net",
"whois.apnic.net",
"whois.afrinic.net",
@ -25,7 +25,7 @@ struct server_referral_handler {
void (*handler)(char **referral_server, const char *buf);
};
const struct server_referral_handler server_referral_handlers[] = {
static const struct server_referral_handler server_referral_handlers[] = {
{ "whois.apnic.net", find_referral_server_apnic },
{ "whois.arin.net", find_referral_server_arin },
{ "whois.iana.org", find_referral_server_iana },
@ -34,7 +34,7 @@ const struct server_referral_handler server_referral_handlers[] = {
{ NULL, NULL }
};
const char *hide_strings[] = {
static const char *hide_strings[] = {
"The data in Networksolutions.com's WHOIS database", NULL,
/* Some registrars like .wang copied the first paragraph of this
* disclaimer, so the detection here needs to be split in two parts. */
@ -95,7 +95,7 @@ const char *hide_strings[] = {
NULL, NULL
};
const char *nic_handles[] = {
static const char *nic_handles[] = {
"net-", "whois.arin.net",
"netblk-", "whois.arin.net",
"poem-", "whois.ripe.net",
@ -117,7 +117,7 @@ struct ip_del {
const char *serv;
};
const struct ip_del ip_assign[] = {
static const struct ip_del ip_assign[] = {
#include "ip_del_recovered.h"
#include "ip_del.h"
{ 0, 0, NULL }
@ -129,7 +129,7 @@ struct ip6_del {
const char *serv;
};
const struct ip6_del ip6_assign[] = {
static const struct ip6_del ip6_assign[] = {
#include "ip6_del.h"
{ 0, 0, NULL }
};
@ -140,22 +140,22 @@ struct as_del {
const char *serv;
};
const struct as_del as_assign[] = {
static const struct as_del as_assign[] = {
#include "as_del.h"
{ 0, 0, NULL }
};
const char *new_gtlds[] = {
static const char *new_gtlds[] = {
#include "new_gtlds.h"
NULL
};
const char *tld_serv[] = {
static const char *tld_serv[] = {
#include "tld_serv.h"
NULL, NULL
};
const char *nic_handles_post[] = {
static const char *nic_handles_post[] = {
#include "nic_handles.h"
NULL, NULL
};
@ -167,7 +167,7 @@ struct server_charset {
const char *options;
};
const struct server_charset servers_charset[] = {
static const struct server_charset servers_charset[] = {
#include "servers_charset.h"
{ NULL, NULL, NULL }
};

12
whois.c
View File

@ -78,15 +78,19 @@ static void find_referral_server_verisign(char **, const char *);
#endif
/* Global variables */
int sockfd, verb = 0, no_recursion = 0;
static int sockfd, verb = 0, no_recursion = 0;
/* flags for RIPE-like servers */
static const char *ripeflags="abBcdFGKlLmMrRx";
static const char *ripeflagsp="gisTtvq";
#ifdef ALWAYS_HIDE_DISCL
int hide_discl = HIDE_NOT_STARTED;
static int hide_discl = HIDE_NOT_STARTED;
#else
int hide_discl = HIDE_DISABLED;
static int hide_discl = HIDE_DISABLED;
#endif
const char *client_tag = IDSTRING;
static const char *client_tag = IDSTRING;
#ifndef HAVE_GETOPT_LONG
extern char *optarg;

View File

@ -34,9 +34,3 @@ char *convert_in6arpa(const char *);
int handle_query(const char *server, const char *port,
const char *qstring, const char *fstring);
void split_server_port(const char *const input, char **server, char **port);
/* flags for RIPE-like servers */
const char *ripeflags="abBcdFGKlLmMrRx";
const char *ripeflagsp="gisTtvq";