From owner-svn-src-all@FreeBSD.ORG  Tue Nov  5 14:20:40 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7E3E4422;
 Tue,  5 Nov 2013 14:20:40 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 691392B10;
 Tue,  5 Nov 2013 14:20:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5EKeK5098105;
 Tue, 5 Nov 2013 14:20:40 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5EKe7M098104;
 Tue, 5 Nov 2013 14:20:40 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201311051420.rA5EKe7M098104@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 5 Nov 2013 14:20:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257705 - head/tools/tools/syscall_timing
X-SVN-Group: head
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Nov 2013 14:20:40 -0000

Author: pluknet
Date: Tue Nov  5 14:20:39 2013
New Revision: 257705
URL: http://svnweb.freebsd.org/changeset/base/257705

Log:
  Clean up -Wtautological-compare -Wformat warnings.

Modified:
  head/tools/tools/syscall_timing/syscall_timing.c

Modified: head/tools/tools/syscall_timing/syscall_timing.c
==============================================================================
--- head/tools/tools/syscall_timing/syscall_timing.c	Tue Nov  5 14:11:31 2013	(r257704)
+++ head/tools/tools/syscall_timing/syscall_timing.c	Tue Nov  5 14:20:39 2013	(r257705)
@@ -192,7 +192,8 @@ test_pipe(uintmax_t num, uintmax_t int_a
 uintmax_t
 test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path)
 {
-	uintmax_t i, so;
+	uintmax_t i;
+	int so;
 
 	so = socket(int_arg, SOCK_STREAM, 0);
 	if (so < 0)
@@ -214,7 +215,8 @@ test_socket_stream(uintmax_t num, uintma
 uintmax_t
 test_socket_dgram(uintmax_t num, uintmax_t int_arg, const char *path)
 {
-	uintmax_t i, so;
+	uintmax_t i;
+	int so;
 
 	so = socket(int_arg, SOCK_DGRAM, 0);
 	if (so < 0)
@@ -408,7 +410,8 @@ test_dup(uintmax_t num, uintmax_t int_ar
 uintmax_t
 test_shmfd(uintmax_t num, uintmax_t int_arg, const char *path)
 {
-	uintmax_t i, shmfd;
+	uintmax_t i;
+	int shmfd;
 
 	shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600);
 	if (shmfd < 0)
@@ -431,7 +434,8 @@ uintmax_t
 test_fstat_shmfd(uintmax_t num, uintmax_t int_arg, const char *path)
 {
 	struct stat sb;
-	uintmax_t i, shmfd;
+	uintmax_t i;
+	int shmfd;
 
 	shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600);
 	if (shmfd < 0)
@@ -785,7 +789,7 @@ main(int argc, char *argv[])
 			    path);
 			timespecsub(&ts_end, &ts_start);
 			printf("%s\t%d\t", the_test->t_name, k);
-			printf("%ju.%09ju\t%d\t", (uintmax_t)ts_end.tv_sec,
+			printf("%ju.%09ju\t%ju\t", (uintmax_t)ts_end.tv_sec,
 			    (uintmax_t)ts_end.tv_nsec, calls);
 
 		/*