[PATCH 14/26] cpukit/libmisc/capture: Manually change license to BSD-2

Tue Mar 22 07:49:31 UTC 2022

Am 18.03.22 um 17:21 schrieb Joel Sherrill:
> These files did not follow the standard format and needed to be
> changed manually.
> 
> Updates #3053.
> ---
>   cpukit/libmisc/capture/README                 |  4 +-
>   cpukit/libmisc/capture/capture-cli.c          | 57 ++++++++++++-------
>   cpukit/libmisc/capture/capture.c              | 55 +++++++++++-------
>   cpukit/libmisc/capture/capture_buffer.c       | 49 ++++++++++------
>   cpukit/libmisc/capture/capture_buffer.h       | 42 +++++++++-----
>   cpukit/libmisc/capture/capture_support.c      | 57 ++++++++++++-------
>   .../libmisc/capture/capture_user_extension.c  | 51 +++++++++++------
>   7 files changed, 200 insertions(+), 115 deletions(-)
> 
> diff --git a/cpukit/libmisc/capture/README b/cpukit/libmisc/capture/README
> index 3e59637149..806bb37d1f 100644
> --- a/cpukit/libmisc/capture/README
> +++ b/cpukit/libmisc/capture/README
> @@ -1,7 +1,7 @@
>             RTEMS Performance Monitoring and Measurement Framework
>   
> -                              Copyright 2002-2007 Chris Johns (chrisj at rtems.org)
> -                                                                 23 April 2002
> +          Copyright 2002-2007 Chris Johns (chrisj at rtems.org)
> +                          23 April 2002
>   
>   This directory contains the source code for the performance monitoring and
>   measurement framework. It is more commonly know as the capture engine.
> diff --git a/cpukit/libmisc/capture/capture-cli.c b/cpukit/libmisc/capture/capture-cli.c
> index d489d9f32a..d8afc982a1 100644
> --- a/cpukit/libmisc/capture/capture-cli.c
> +++ b/cpukit/libmisc/capture/capture-cli.c
> @@ -1,25 +1,40 @@
> -/*
> -  ------------------------------------------------------------------------
> -
> -  Copyright 2002, 2015 Chris Johns <chrisj at rtems.org>
> -  All rights reserved.
> -
> -  COPYRIGHT (c) 2014.
> -  On-Line Applications Research Corporation (OAR).
> -
> -  The license and distribution terms for this file may be
> -  found in the file LICENSE in this distribution.
> -
> -  This software with is provided ``as is'' and with NO WARRANTY.
> -
> -  ------------------------------------------------------------------------
> -
> -  RTEMS Performance Monitoring and Measurement Framework.
> -
> -  This is the Target Interface Command Line Interface. You need
> -  start the RTEMS monitor.
> +/**
> + * @file
> + *
> + * @brief RTEMS Performance Monitoring and Measurement Framework.
> + *
> + * This is the Target Interface Command Line Interface. You need
> + * start the RTEMS monitor.
> + */
>   
> -*/
> +/*
> + * Copyright 2002, 2015 Chris Johns <chrisj at rtems.org>.
> + * All rights reserved.
> + *
> + * COPYRIGHT (c) 2014.
> + * On-Line Applications Research Corporation (OAR).
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
>   
>   #ifdef HAVE_CONFIG_H
>   #include "config.h"
> diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c
> index bba7d91396..2ed607ecaf 100644
> --- a/cpukit/libmisc/capture/capture.c
> +++ b/cpukit/libmisc/capture/capture.c
> @@ -1,24 +1,39 @@
> -/*
> -  ------------------------------------------------------------------------
> -
> -  Copyright 2002, 2016 Chris Johns <chrisj at rtems.org>.
> -  All rights reserved.
> -
> -  COPYRIGHT (c) 1989-2014.
> -  On-Line Applications Research Corporation (OAR).
> -
> -  The license and distribution terms for this file may be
> -  found in the file LICENSE in this distribution.
> -
> -  This software with is provided ``as is'' and with NO WARRANTY.
> -
> -  ------------------------------------------------------------------------
> -
> -  RTEMS Performance Monitoring and Measurement Framework.
> -
> -  This is the Capture Engine component.
> +/**
> + * @file
> + *
> + * @brief RTEMS Performance Monitoring and Measurement Framework.
> + *
> + * This is the Capture Engine component.
> + */
>   
> -*/
> +/*
> + * Copyright 2002, 2016 Chris Johns <chrisj at rtems.org>.
> + * All rights reserved.
> + *
> + * COPYRIGHT (c) 1989-2014.
> + * On-Line Applications Research Corporation (OAR).
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
>   
>   #ifdef HAVE_CONFIG_H
>   #include "config.h"
> diff --git a/cpukit/libmisc/capture/capture_buffer.c b/cpukit/libmisc/capture/capture_buffer.c
> index 967842000b..2b7d6947e5 100644
> --- a/cpukit/libmisc/capture/capture_buffer.c
> +++ b/cpukit/libmisc/capture/capture_buffer.c
> @@ -1,22 +1,35 @@
> -/*
> -  ------------------------------------------------------------------------
> -
> -  COPYRIGHT (c) 2014.
> -  On-Line Applications Research Corporation (OAR).
> -
> -  The license and distribution terms for this file may be
> -  found in the file LICENSE in this distribution.
> -
> -  This software with is provided ``as is'' and with NO WARRANTY.
> +/**
> + * @file
> + *
> + * @brief RTEMS Performance Monitoring and Measurement Framework.
> + * This is the Target Interface Command Line Interface. You need
> + * to start the RTEMS monitor.
> + */

I think there is a missing empty line after @brief. At least all other 
files have the new line.

>   
> -  ------------------------------------------------------------------------
> -
> -  RTEMS Performance Monitoring and Measurement Framework.
> -
> -  This is the Target Interface Command Line Interface. You need
> -  start the RTEMS monitor.
> -
> -*/
> +/*
> + *  COPYRIGHT (c) 2014.  On-Line Applications Research Corporation (OAR).
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
>   
>   #ifdef HAVE_CONFIG_H
>   #include "config.h"
> diff --git a/cpukit/libmisc/capture/capture_buffer.h b/cpukit/libmisc/capture/capture_buffer.h
> index af75c0204c..8f2f59b39f 100644
> --- a/cpukit/libmisc/capture/capture_buffer.h
> +++ b/cpukit/libmisc/capture/capture_buffer.h
> @@ -7,21 +7,33 @@
>    */
>   
>   /*
> -  ------------------------------------------------------------------------
> -
> -  COPYRIGHT (c) 2014.
> -  On-Line Applications Research Corporation (OAR).
> -
> -  Copyright 2016 Chris Johns <chrisj at rtems.org>.
> -  All rights reserved.
> -
> -  The license and distribution terms for this file may be
> -  found in the file LICENSE in this distribution.
> -
> -  This software with is provided ``as is'' and with NO WARRANTY.
> -
> -  ------------------------------------------------------------------------
> -*/
> + * COPYRIGHT (c) 2014.
> + * On-Line Applications Research Corporation (OAR).
> + *
> + * Copyright 2016 Chris Johns <chrisj at rtems.org>.
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
>   
>   #ifndef __CAPTURE_BUFFER_H_
>   #define __CAPTURE_BUFFER_H_
> diff --git a/cpukit/libmisc/capture/capture_support.c b/cpukit/libmisc/capture/capture_support.c
> index e2438fb23b..ab301ddeb3 100644
> --- a/cpukit/libmisc/capture/capture_support.c
> +++ b/cpukit/libmisc/capture/capture_support.c
> @@ -1,25 +1,40 @@
> -/*
> -  ------------------------------------------------------------------------
> -
> -  Copyright 2002, 2015 Chris Johns <chrisj at rtems.org>
> -  All rights reserved.
> -
> -  COPYRIGHT (c) 1989-2014.
> -  On-Line Applications Research Corporation (OAR).
> -
> -  The license and distribution terms for this file may be
> -  found in the file LICENSE in this distribution.
> -
> -  This software with is provided ``as is'' and with NO WARRANTY.
> -
> -  ------------------------------------------------------------------------
> -
> -  RTEMS Performance Monitoring and Measurement Framework.
> -
> -  This is a set of print support routines that may be shared between
> -  the RTEMS monitor and direct callers of the capture engine.
> +/**
> + * @file
> + *
> + * @brief RTEMS Performance Monitoring and Measurement Framework.
> + *
> + * This is a set of print support routines that may be shared between
> + * the RTEMS monitor and direct callers of the capture engine.
> + */
>   
> -*/
> +/*
> + * Copyright 2002, 2015 Chris Johns <chrisj at rtems.org>
> + * All rights reserved.
> + *
> + * COPYRIGHT (c) 1989-2014.
> + * On-Line Applications Research Corporation (OAR).
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
>   
>   #ifdef HAVE_CONFIG_H
>   #include "config.h"
> diff --git a/cpukit/libmisc/capture/capture_user_extension.c b/cpukit/libmisc/capture/capture_user_extension.c
> index ae4107afbc..8f793f1c9b 100644
> --- a/cpukit/libmisc/capture/capture_user_extension.c
> +++ b/cpukit/libmisc/capture/capture_user_extension.c
> @@ -1,22 +1,37 @@
> +/**
> + * @file
> + *
> + * @brief RTEMS Performance Monitoring and Measurement Framework.
> + *
> + * This is the Capture Engine component.
> + */
>   /*
> -  ------------------------------------------------------------------------
> -
> -  Copyright 2002, 2016 Chris Johns <chrisj at rtems.org>. All rights reserved.
> -
> -  COPYRIGHT (c) 1989-2014.
> -  On-Line Applications Research Corporation (OAR).
> -
> -  The license and distribution terms for this file may be
> -  found in the file LICENSE in this distribution.
> -
> -  This software with is provided ``as is'' and with NO WARRANTY.
> -
> -  ------------------------------------------------------------------------
> -
> -  RTEMS Performance Monitoring and Measurement Framework.
> -
> -  This is the Capture Engine component.
> -*/
> + * Copyright 2002, 2016 Chris Johns <chrisj at rtems.org>. All rights reserved.
> + *
> + * COPYRIGHT (c) 1989-2014.
> + * On-Line Applications Research Corporation (OAR).
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
>   
>   #ifdef HAVE_CONFIG_H
>   #include "config.h"

-- 
--------------------------------------------
embedded brains GmbH
Herr Christian MAUDERER
Dornierstr. 4
82178 Puchheim
Germany
email: christian.mauderer at embedded-brains.de
phone: +49-89-18 94 741 - 18
fax:   +49-89-18 94 741 - 08

Registergericht: Amtsgericht München
Registernummer: HRB 157899
Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler
Unsere Datenschutzerklärung finden Sie hier:
https://embedded-brains.de/datenschutzerklaerung/