svn commit: r333409 - in head/sys: netinet sys

[Warner Losh]

On Wed, May 9, 2018 at 2:05 PM, Oliver Pinter <oliver.pinter at hardenedbsd.org
> wrote:

>
>
> On Wednesday, May 9, 2018, Warner Losh <imp at freebsd.org> wrote:
>
>> 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.
>
>
> Hi!
>
> Could you please use full year here, same as in the other parts of this
> patch?
>

Doh!  I fixed that before the commit. I was sure.... Anyway, fixed now
in r333433.

Warner

  *
>>   * 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__ */
>> _______________________________________________
>> svn-src-head at freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
>>
>