From owner-svn-src-stable@FreeBSD.ORG  Sat Jun 23 00:37:33 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7884A10656DC;
	Sat, 23 Jun 2012 00:37:33 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 625D48FC17;
	Sat, 23 Jun 2012 00:37:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5N0bX4P009260;
	Sat, 23 Jun 2012 00:37:33 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5N0bXov009258;
	Sat, 23 Jun 2012 00:37:33 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201206230037.q5N0bXov009258@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 23 Jun 2012 00:37:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237464 - in stable: 7/usr.bin/makewhatis
	8/usr.bin/makewhatis 9/usr.bin/makewhatis
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jun 2012 00:37:33 -0000

Author: delphij
Date: Sat Jun 23 00:37:32 2012
New Revision: 237464
URL: http://svn.freebsd.org/changeset/base/237464

Log:
  MFC r237348:
  
  Currently the code uses gzFile * for a zlib file descriptor, which
  is not correct.  The code works by accident because gzFile is
  currently defined as void *, and internally it would be casted from
  or to its real type.
  
  A newer version of zlib will instead define it as a pointer to a
  specific type pointer (namely, struct gzFile_s *).  This therefore
  would cause stricter checks and compiler would catch this type
  mismatch.
  
  This change does not cause any changes to the resulting binary,
  as validated with md5(1).

Modified:
  stable/7/usr.bin/makewhatis/makewhatis.c
Directory Properties:
  stable/7/usr.bin/makewhatis/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/usr.bin/makewhatis/makewhatis.c
  stable/9/usr.bin/makewhatis/makewhatis.c
Directory Properties:
  stable/8/usr.bin/makewhatis/   (props changed)
  stable/9/usr.bin/makewhatis/   (props changed)

Modified: stable/7/usr.bin/makewhatis/makewhatis.c
==============================================================================
--- stable/7/usr.bin/makewhatis/makewhatis.c	Fri Jun 22 22:59:42 2012	(r237463)
+++ stable/7/usr.bin/makewhatis/makewhatis.c	Sat Jun 23 00:37:32 2012	(r237464)
@@ -692,7 +692,7 @@ enum { STATE_UNKNOWN, STATE_MANSTYLE, ST
 static void
 process_page(struct page_info *page, char *section_dir)
 {
-	gzFile *in;
+	gzFile in;
 	char buffer[4096];
 	char *line;
 	StringList *names;