From owner-svn-src-head@FreeBSD.ORG  Sat Nov  3 18:38:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E4F5B3E4;
 Sat,  3 Nov 2012 18:38:28 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id CC5A98FC14;
 Sat,  3 Nov 2012 18:38:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA3IcSDk021857;
 Sat, 3 Nov 2012 18:38:28 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA3IcSUR021854;
 Sat, 3 Nov 2012 18:38:28 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201211031838.qA3IcSUR021854@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 3 Nov 2012 18:38:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242519 - head/usr.sbin/watchdogd
X-SVN-Group: head
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Nov 2012 18:38:29 -0000

Author: delphij
Date: Sat Nov  3 18:38:28 2012
New Revision: 242519
URL: http://svn.freebsd.org/changeset/base/242519

Log:
  Replace log(3) with flsll(3) for watchdogd(8) and drop libm dependency.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/watchdogd/Makefile
  head/usr.sbin/watchdogd/watchdogd.c

Modified: head/usr.sbin/watchdogd/Makefile
==============================================================================
--- head/usr.sbin/watchdogd/Makefile	Sat Nov  3 18:21:32 2012	(r242518)
+++ head/usr.sbin/watchdogd/Makefile	Sat Nov  3 18:38:28 2012	(r242519)
@@ -4,8 +4,8 @@ PROG=	watchdogd
 LINKS=	${BINDIR}/watchdogd ${BINDIR}/watchdog
 MAN=	watchdogd.8 watchdog.8
 
-LDADD=	-lm -lutil
-DPADD=	${LIBM} ${LIBUTIL}
+LDADD=	-lutil
+DPADD=	${LIBUTIL}
 
 .include <bsd.prog.mk>
 

Modified: head/usr.sbin/watchdogd/watchdogd.c
==============================================================================
--- head/usr.sbin/watchdogd/watchdogd.c	Sat Nov  3 18:21:32 2012	(r242518)
+++ head/usr.sbin/watchdogd/watchdogd.c	Sat Nov  3 18:38:28 2012	(r242519)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <sysexits.h>
 #include <unistd.h>
 
@@ -280,7 +281,7 @@ parseargs(int argc, char *argv[])
 			if (a == 0)
 				timeout = WD_TO_NEVER;
 			else
-				timeout = 1.0 + log(a * 1e9) / log(2.0);
+				timeout = flsll(a * 1e9);
 			if (debugging)
 				printf("Timeout is 2^%d nanoseconds\n",
 				    timeout);