From owner-svn-src-head@freebsd.org Wed May 9 14:11:37 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50747FBBA14; Wed, 9 May 2018 14:11:37 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02BEF6C827; Wed, 9 May 2018 14:11:37 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D9193127B8; Wed, 9 May 2018 14:11:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w49EBa2w073116; Wed, 9 May 2018 14:11:36 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w49EBaa6073113; Wed, 9 May 2018 14:11:36 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201805091411.w49EBaa6073113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 9 May 2018 14:11:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333409 - in head/sys: netinet sys X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: netinet sys X-SVN-Commit-Revision: 333409 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 14:11:37 -0000 Author: imp Date: Wed May 9 14:11:35 2018 New Revision: 333409 URL: https://svnweb.freebsd.org/changeset/base/333409 Log: Minor style nits Use full copyright year. Remove 'All Rights Reserved' from new file (rights holder OK'd) Minor #ifdef motion and #endif tagging Remove __FBSDID macro from comments Sponsored by: Netflix OK'd by: rrs@ Modified: head/sys/netinet/tcp_hpts.c head/sys/netinet/tcp_hpts.h head/sys/sys/kern_prefetch.h Modified: head/sys/netinet/tcp_hpts.c ============================================================================== --- head/sys/netinet/tcp_hpts.c Wed May 9 13:53:10 2018 (r333408) +++ head/sys/netinet/tcp_hpts.c Wed May 9 14:11:35 2018 (r333409) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2016-8 - * Netflix Inc. All rights reserved. + * Copyright (c) 2016-2018 Netflix Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/netinet/tcp_hpts.h ============================================================================== --- head/sys/netinet/tcp_hpts.h Wed May 9 13:53:10 2018 (r333408) +++ head/sys/netinet/tcp_hpts.h Wed May 9 14:11:35 2018 (r333409) @@ -1,8 +1,5 @@ -#ifndef __tcp_hpts_h__ -#define __tcp_hpts_h__ /*- - * Copyright (c) 2016-8 - * Netflix Inc. All rights reserved. + * Copyright (c) 2016-18 Netflix Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,9 +22,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * __FBSDID("$FreeBSD$") + * $FreeBSD$ */ +#ifndef __tcp_hpts_h__ +#define __tcp_hpts_h__ + /* * The hpts uses a 102400 wheel. The wheel * defines the time in 10 usec increments (102400 x 10). @@ -300,5 +300,5 @@ tcp_get_usecs(struct timeval *tv) return (tcp_tv_to_usectick(tv)); } -#endif -#endif +#endif /* _KERNEL */ +#endif /* __tcp_hpts_h__ */ Modified: head/sys/sys/kern_prefetch.h ============================================================================== --- head/sys/sys/kern_prefetch.h Wed May 9 13:53:10 2018 (r333408) +++ head/sys/sys/kern_prefetch.h Wed May 9 14:11:35 2018 (r333409) @@ -1,7 +1,5 @@ -#ifndef __kern_prefetch_h__ /*- - * Copyright (c) 2016-8 - * Netflix Inc. All rights reserved. + * Copyright (c) 2016-2018 Netflix Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,8 +22,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * __FBSDID("$FreeBSD$") + * $FreeBSD$ */ +#ifndef __kern_prefetch_h__ #define __kern_prefetch_h__ #ifdef _KERNEL @@ -39,5 +38,5 @@ kern_prefetch(const volatile void *addr, void* before) #endif } -#endif -#endif +#endif /* _KERNEL */ +#endif /* __kern_prefetch_h__ */