From owner-svn-ports-head@freebsd.org  Sat Aug 12 21:49:50 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F5DCDCA83A;
 Sat, 12 Aug 2017 21:49:50 +0000 (UTC)
 (envelope-from mandree@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 mx1.freebsd.org (Postfix) with ESMTPS id 5C1FA72805;
 Sat, 12 Aug 2017 21:49:50 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7CLnnke097408;
 Sat, 12 Aug 2017 21:49:49 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7CLnnPM097407;
 Sat, 12 Aug 2017 21:49:49 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <201708122149.v7CLnnPM097407@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sat, 12 Aug 2017 21:49:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r447863 - head/sysutils/e2fsprogs/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: mandree
X-SVN-Commit-Paths: head/sysutils/e2fsprogs/files
X-SVN-Commit-Revision: 447863
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Aug 2017 21:49:50 -0000

Author: mandree
Date: Sat Aug 12 21:49:49 2017
New Revision: 447863
URL: https://svnweb.freebsd.org/changeset/ports/447863

Log:
  Fix quota warnings in non-LP64 mode (11.x i386).
  
  PR:		221447
  Reported by:	vvd@unislabs.com

Added:
  head/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c   (contents, props changed)

Added: head/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c	Sat Aug 12 21:49:49 2017	(r447863)
@@ -0,0 +1,21 @@
+--- lib/support/mkquota.c.orig	2017-07-24 19:15:39 UTC
++++ lib/support/mkquota.c
+@@ -10,6 +10,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <fcntl.h>
++#include <inttypes.h>
+ 
+ #include "ext2fs/ext2_fs.h"
+ #include "ext2fs/ext2fs.h"
+@@ -523,8 +524,8 @@ static int scan_dquots_callback(struct d
+ 	if (dq->dq_dqb.dqb_curspace != dquot->dq_dqb.dqb_curspace ||
+ 	    dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) {
+ 		scan_data->usage_is_inconsistent = 1;
+-		fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:"
+-			"actual (%ld, %ld) != expected (%ld, %ld)\n",
++		fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %" PRIu32 ":"
++			"actual (%" PRId64 ", %" PRId64 ") != expected (%" PRId64 ", %" PRId64 ")\n",
+ 			dq->dq_id, dq->dq_dqb.dqb_curspace,
+ 			dq->dq_dqb.dqb_curinodes,
+ 			dquot->dq_dqb.dqb_curspace,