From owner-svn-src-head@FreeBSD.ORG  Thu Oct 16 22:04:08 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CEF3C494;
 Thu, 16 Oct 2014 22:04:08 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BB22C841;
 Thu, 16 Oct 2014 22:04:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9GM48oC009654;
 Thu, 16 Oct 2014 22:04:08 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9GM48sa009652;
 Thu, 16 Oct 2014 22:04:08 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201410162204.s9GM48sa009652@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 16 Oct 2014 22:04:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273189 - in head: lib/libc/string sys/libkern
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.18-1
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: Thu, 16 Oct 2014 22:04:08 -0000

Author: delphij
Date: Thu Oct 16 22:04:07 2014
New Revision: 273189
URL: https://svnweb.freebsd.org/changeset/base/273189

Log:
  Remove duplicated code.
  
  Suggested by:	jmg

Deleted:
  head/lib/libc/string/explicit_bzero.c
Modified:
  head/lib/libc/string/Makefile.inc
  head/sys/libkern/explicit_bzero.c

Modified: head/lib/libc/string/Makefile.inc
==============================================================================
--- head/lib/libc/string/Makefile.inc	Thu Oct 16 22:00:24 2014	(r273188)
+++ head/lib/libc/string/Makefile.inc	Thu Oct 16 22:04:07 2014	(r273189)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string ${LIBC_SRCTOP}/string
+.PATH: ${LIBC_SRCTOP}/../../sys/libkern
 
 CFLAGS+= -I${LIBC_SRCTOP}/locale
 

Modified: head/sys/libkern/explicit_bzero.c
==============================================================================
--- head/sys/libkern/explicit_bzero.c	Thu Oct 16 22:00:24 2014	(r273188)
+++ head/sys/libkern/explicit_bzero.c	Thu Oct 16 22:04:07 2014	(r273189)
@@ -7,7 +7,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifdef _KERNEL
 #include <sys/libkern.h>
+#else
+#include <string.h>
+#endif /* _KERNEL */
 
 __attribute__((weak)) void __explicit_bzero_hook(void *, size_t);