From owner-svn-src-all@freebsd.org  Sun Dec 29 06:59:09 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id CC3A11D6BC7;
 Sun, 29 Dec 2019 06:59:09 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47lryP4yLNz4Cr6;
 Sun, 29 Dec 2019 06:59:09 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5777DC29;
 Sun, 29 Dec 2019 06:59:09 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBT6x9c0085820;
 Sun, 29 Dec 2019 06:59:09 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBT6x9qW085819;
 Sun, 29 Dec 2019 06:59:09 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201912290659.xBT6x9qW085819@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 29 Dec 2019 06:59:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r356169 - head/usr.sbin/fstyp
X-SVN-Group: head
X-SVN-Commit-Author: adrian
X-SVN-Commit-Paths: head/usr.sbin/fstyp
X-SVN-Commit-Revision: 356169
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Dec 2019 06:59:09 -0000

Author: adrian
Date: Sun Dec 29 06:59:09 2019
New Revision: 356169
URL: https://svnweb.freebsd.org/changeset/base/356169

Log:
  Make this compile under external gcc toolchain if WITH_ICONV isn't defined.
  
  This quietens a bunch of unused variable warnings that are treated as errors.

Modified:
  head/usr.sbin/fstyp/ntfs.c

Modified: head/usr.sbin/fstyp/ntfs.c
==============================================================================
--- head/usr.sbin/fstyp/ntfs.c	Sun Dec 29 05:36:01 2019	(r356168)
+++ head/usr.sbin/fstyp/ntfs.c	Sun Dec 29 06:59:09 2019	(r356169)
@@ -134,12 +134,15 @@ int
 fstyp_ntfs(FILE *fp, char *label, size_t size)
 {
 	struct ntfs_bootfile *bf;
+	char *filerecp;
+#ifdef WITH_ICONV
 	struct ntfs_filerec *fr;
 	struct ntfs_attr *atr;
 	off_t voloff;
-	char *filerecp, *ap;
+	char *ap;
 	int8_t mftrecsz;
 	int recsize;
+#endif /* WITH_ICONV */
 
 	filerecp = NULL;