d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whois: code cleanup

Browse Source 
Remove deprecated options.

Use pedantically correct types.
This commit is contained in:
fanf 2015-05-14 10:32:05 +00:00
parent 1e9ac2722e
commit 426168849a
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/whois/whois.c
View File

@ -119,7 +119,7 @@ main(int argc, char *argv[])
country = host = qnichost = NULL;
flags = use_qnichost = 0;
while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:QrR6")) != -1) {
while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:Qr")) != -1) {
switch (ch) {
case 'a':
host = ANICHOST;
@ -166,15 +166,6 @@ main(int argc, char *argv[])
case 'r':
host = RNICHOST;
break;
case 'R':
warnx("-R is deprecated; use '-c ru' instead");
country = "ru";
break;
/* Remove in FreeBSD 10 */
case '6':
errx(EX_USAGE,
"-6 is deprecated; use -[aAflr] instead");
break;
case '?':
default:
usage();
@ -300,8 +291,9 @@ whois(const char *query, const char *hostname, int flags)
FILE *fp;
struct addrinfo *hostres, *res;
char *buf, *host, *nhost, *p;
int i, j, s = -1, count;
size_t c, len;
int s = -1;
nfds_t i, j;
size_t c, len, count;
struct pollfd *fds;
int timeout = 180;
@ -497,7 +489,7 @@ static void
usage(void)
{
fprintf(stderr,
"usage: whois [-aAbfgiIklmQrR6] [-c country-code | -h hostname] "
"usage: whois [-aAbfgiIklmQr] [-c country-code | -h hostname] "
"[-p port] name ...\n");
exit(EX_USAGE);
}