Updated license headers to latest GENIVI license policy. Fixed further LRT Scan findings. Renamed and cleanup further files.

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

11 files changed, 144 insertions, 84 deletions

diff --git a/examples/README.txt b/examples/README.txt
index 6599b7c..5d871b6 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -1,3 +1,9 @@
+Copyright (C) 2015 BMW AG.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
 This folder contains several examples of applications using the DLT library. These examples will be extended in the future to show different Use Cases.
 
 Example1: Minimal DLT Example
diff --git a/examples/example1/CMakeLists.txt b/examples/example1/CMakeLists.txt
index d95ebfc..f18526d 100755
--- a/examples/example1/CMakeLists.txt
+++ b/examples/example1/CMakeLists.txt
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 #
 # DLT example implementation
diff --git a/examples/example1/example1.c b/examples/example1/example1.c
index 4c812dd..e525781 100644
--- a/examples/example1/example1.c
+++ b/examples/example1/example1.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file example1.c
+*/
+
 
 /*******************************************************************************
 **                                                                            **
diff --git a/examples/example2/CMakeLists.txt b/examples/example2/CMakeLists.txt
index fd7bae8..d081b56 100755
--- a/examples/example2/CMakeLists.txt
+++ b/examples/example2/CMakeLists.txt
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 #
 # DLT example implementation
diff --git a/examples/example2/dlt_id.h b/examples/example2/dlt_id.h
index e5d1dbc..5c93d6f 100644
--- a/examples/example2/dlt_id.h
+++ b/examples/example2/dlt_id.h
@@ -1,3 +1,20 @@
+/*
+ * @licence app begin@
+ * SPDX license identifier: MPL-2.0
+ *
+ * Copyright (C) 2011-2015, BMW AG"
+ *
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ *
+ * This Source Code Form is subject to the terms of the
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * For further information see http://www.genivi.org/.
+ * @licence end@
+ */
+
 // generated file, do not edit
 
 #ifndef DLT_ID_H
diff --git a/examples/example2/example2.c b/examples/example2/example2.c
index 7daa9a9..73c1916 100644
--- a/examples/example2/example2.c
+++ b/examples/example2/example2.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file example2.c
+*/
+
 
 /*******************************************************************************
 **                                                                            **
diff --git a/examples/example3/CMakeLists.txt b/examples/example3/CMakeLists.txt
index 7e7cf1a..92e5385 100755
--- a/examples/example3/CMakeLists.txt
+++ b/examples/example3/CMakeLists.txt
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 #
 # DLT example implementation
diff --git a/examples/example3/dlt_id.h b/examples/example3/dlt_id.h
index 844de3c..29a3b91 100644
--- a/examples/example3/dlt_id.h
+++ b/examples/example3/dlt_id.h
@@ -1,3 +1,20 @@
+/*
+ * @licence app begin@
+ * SPDX license identifier: MPL-2.0
+ *
+ * Copyright (C) 2011-2015, BMW AG"
+ *
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ *
+ * This Source Code Form is subject to the terms of the
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * For further information see http://www.genivi.org/.
+ * @licence end@
+ */
+
 // generated file, do not edit
 
 #ifndef DLT_ID_H
diff --git a/examples/example3/example3.c b/examples/example3/example3.c
index 737a2a1..4c90f97 100644
--- a/examples/example3/example3.c
+++ b/examples/example3/example3.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file example3.c
+*/
+
 
 /*******************************************************************************
 **                                                                            **
diff --git a/examples/example4/CMakeLists.txt b/examples/example4/CMakeLists.txt
index e558904..c56a340 100755
--- a/examples/example4/CMakeLists.txt
+++ b/examples/example4/CMakeLists.txt
@@ -1,18 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
 #
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 #
 # DLT example implementation
diff --git a/examples/example4/example4.c b/examples/example4/example4.c
index 4b7d862..4e11ae8 100644
--- a/examples/example4/example4.c
+++ b/examples/example4/example4.c
@@ -1,25 +1,29 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2014  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * This Source Code Form is subject to the terms of the
- * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
- * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file example4.c
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
 
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \copyright Copyright © 2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file example4.c
+*/
+
 
 /*******************************************************************************
 **                                                                            **