From owner-svn-src-all@FreeBSD.ORG  Sat Jun 19 17:04:01 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9C7D106566B;
	Sat, 19 Jun 2010 17:04:01 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B83B78FC13;
	Sat, 19 Jun 2010 17:04:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5JH411b041257;
	Sat, 19 Jun 2010 17:04:01 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5JH410c041255;
	Sat, 19 Jun 2010 17:04:01 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201006191704.o5JH410c041255@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sat, 19 Jun 2010 17:04:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209344 - head/usr.sbin/timed/timed
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 19 Jun 2010 17:04:01 -0000

Author: gavin
Date: Sat Jun 19 17:04:01 2010
New Revision: 209344
URL: http://svn.freebsd.org/changeset/base/209344

Log:
  Initialise the "trials" variable to zero earlier in case we unexpectedly
  error out early.
  
  Found by:	clang static analyzer

Modified:
  head/usr.sbin/timed/timed/measure.c

Modified: head/usr.sbin/timed/timed/measure.c
==============================================================================
--- head/usr.sbin/timed/timed/measure.c	Sat Jun 19 16:29:23 2010	(r209343)
+++ head/usr.sbin/timed/timed/measure.c	Sat Jun 19 17:04:01 2010	(r209344)
@@ -86,6 +86,7 @@ measure(maxmsec, wmsec, hname, addr, pri
 	min_idelta = min_odelta = 0x7fffffff;
 	measure_status = HOSTDOWN;
 	measure_delta = HOSTDOWN;
+	trials = 0;
 	errno = 0;
 
 	/* open raw socket used to measure time differences */
@@ -138,7 +139,6 @@ measure(maxmsec, wmsec, hname, addr, pri
 	mstotvround(&twait, wmsec);
 
 	rcvcount = 0;
-	trials = 0;
 	while (rcvcount < MSGS) {
 		(void)gettimeofday(&tcur, 0);