From owner-svn-src-head@freebsd.org  Wed Nov 22 22:04:28 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-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 54530DF6E67;
 Wed, 22 Nov 2017 22:04:28 +0000 (UTC) (envelope-from kib@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 215CD6C28A;
 Wed, 22 Nov 2017 22:04:28 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAMM4R2Y024013;
 Wed, 22 Nov 2017 22:04:27 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAMM4R4W024012;
 Wed, 22 Nov 2017 22:04:27 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201711222204.vAMM4R4W024012@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 22 Nov 2017 22:04:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326108 - head/usr.bin/systat
X-SVN-Group: head
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: head/usr.bin/systat
X-SVN-Commit-Revision: 326108
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Nov 2017 22:04:28 -0000

Author: kib
Date: Wed Nov 22 22:04:27 2017
New Revision: 326108
URL: https://svnweb.freebsd.org/changeset/base/326108

Log:
  Order declarations alphabetically.
  Match signess of the format and the value.
  
  Noted by:	bde
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.bin/systat/vmstat.c

Modified: head/usr.bin/systat/vmstat.c
==============================================================================
--- head/usr.bin/systat/vmstat.c	Wed Nov 22 22:04:04 2017	(r326107)
+++ head/usr.bin/systat/vmstat.c	Wed Nov 22 22:04:27 2017	(r326108)
@@ -138,10 +138,10 @@ static void allocinfo(struct Info *);
 static void copyinfo(struct Info *, struct Info *);
 static float cputime(int);
 static void dinfo(int, int, struct statinfo *, struct statinfo *);
+static void do_putuint64(uint64_t, int, int, int, int);
 static void getinfo(struct Info *);
 static void putint(int, int, int, int);
 static void putuint64(uint64_t, int, int, int);
-static void do_putuint64(uint64_t, int, int, int, int);
 static void putfloat(double, int, int, int, int, int);
 static void putlongdouble(long double, int, int, int, int, int);
 static int ucount(void);
@@ -699,7 +699,7 @@ do_putuint64(uint64_t n, int l, int lc, int w, int div
 			addch(' ');
 		return;
 	}
-	snr = snprintf(b, sizeof(b), "%*jd", w, (uintmax_t)n);
+	snr = snprintf(b, sizeof(b), "%*ju", w, (uintmax_t)n);
 	if (snr != w) {
 		humanize_number(buf, w, n, "", HN_AUTOSCALE,
 		    HN_NOSPACE | HN_DECIMAL | div);