From owner-svn-src-head@FreeBSD.ORG  Thu May 14 10:32:06 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BB5DF96;
 Thu, 14 May 2015 10:32:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AB0541FB1;
 Thu, 14 May 2015 10:32:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4EAW6Du038902;
 Thu, 14 May 2015 10:32:06 GMT (envelope-from fanf@FreeBSD.org)
Received: (from fanf@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4EAW6Kk038901;
 Thu, 14 May 2015 10:32:06 GMT (envelope-from fanf@FreeBSD.org)
Message-Id: <201505141032.t4EAW6Kk038901@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: fanf set sender to fanf@FreeBSD.org
 using -f
From: Tony Finch <fanf@FreeBSD.org>
Date: Thu, 14 May 2015 10:32:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282885 - head/usr.bin/whois
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2015 10:32:06 -0000

Author: fanf
Date: Thu May 14 10:32:05 2015
New Revision: 282885
URL: https://svnweb.freebsd.org/changeset/base/282885

Log:
  whois: code cleanup
  
  Remove deprecated options.
  
  Use pedantically correct types.

Modified:
  head/usr.bin/whois/whois.c

Modified: head/usr.bin/whois/whois.c
==============================================================================
--- head/usr.bin/whois/whois.c	Thu May 14 10:31:37 2015	(r282884)
+++ head/usr.bin/whois/whois.c	Thu May 14 10:32:05 2015	(r282885)
@@ -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 *hos
 	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);
 }