From d8125a0d7e74c58910840d0f28e891ce7ffda60e Mon Sep 17 00:00:00 2001 From: Lutz Helwing Date: Thu, 7 May 2015 11:34:40 +0200 Subject: Updated license headers to latest GENIVI license policy. Fixed further LRT Scan findings. Renamed and cleanup further files. Signed-off-by: Alexander Wenzel --- include/CMakeLists.txt | 19 ++++++++++--------- include/dlt/CMakeLists.txt | 19 ++++++++++--------- include/dlt/dlt.h | 28 ++++++++++++++++------------ include/dlt/dlt_client.h | 28 ++++++++++++++++------------ include/dlt/dlt_common.h | 28 ++++++++++++++++------------ include/dlt/dlt_common_api.h | 28 ++++++++++++++++------------ include/dlt/dlt_filetransfer.h | 25 ++++++++++++++++--------- include/dlt/dlt_offline_trace.h | 28 ++++++++++++++++------------ include/dlt/dlt_protocol.h | 28 ++++++++++++++++------------ include/dlt/dlt_shm.h | 28 ++++++++++++++++------------ include/dlt/dlt_types.h | 28 ++++++++++++++++------------ include/dlt/dlt_user.h | 27 +++++++++++++++------------ include/dlt/dlt_user_macros.h | 28 ++++++++++++++++------------ 13 files changed, 195 insertions(+), 147 deletions(-) (limited to 'include') diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index b567380..02e4b27 100755 --- a/include/CMakeLists.txt +++ b/include/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-2012, BMW AG - Alexander Wenzel -# -# 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@ -######## +####### ADD_SUBDIRECTORY( dlt ) diff --git a/include/dlt/CMakeLists.txt b/include/dlt/CMakeLists.txt index 76121dd..94aeaf4 100644 --- a/include/dlt/CMakeLists.txt +++ b/include/dlt/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-2012, BMW AG - Alexander Wenzel -# -# 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@ -######## +####### install(FILES dlt.h dlt_user.h dlt_user_macros.h dlt_client.h dlt_protocol.h dlt_common.h dlt_types.h dlt_version.h dlt_shm.h dlt_offline_trace.h dlt_filetransfer.h dlt_common_api.h DESTINATION include/dlt diff --git a/include/dlt/dlt.h b/include/dlt/dlt.h index e4bc367..b814077 100755 --- a/include/dlt/dlt.h +++ b/include/dlt/dlt.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt.h ** diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h index 29c7c1b..c62a389 100755 --- a/include/dlt/dlt_client.h +++ b/include/dlt/dlt_client.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt_client.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_client.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index a0d48f6..6e27d4c 100755 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt_common.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_common.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_common.h ** diff --git a/include/dlt/dlt_common_api.h b/include/dlt/dlt_common_api.h index c6670b5..bcd0fed 100644 --- a/include/dlt/dlt_common_api.h +++ b/include/dlt/dlt_common_api.h @@ -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 BMW 2011-2012 - * - * \file dlt_common_api.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_common_api.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_commpn_api.h ** diff --git a/include/dlt/dlt_filetransfer.h b/include/dlt/dlt_filetransfer.h index 44436e7..89e5c7a 100644 --- a/include/dlt/dlt_filetransfer.h +++ b/include/dlt/dlt_filetransfer.h @@ -1,22 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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/. * - * \file dlt_filetransfer.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_filetransfer.h +*/ + #include /* Needed for LONG_MAX */ #include /* Needed for struct stat st*/ #include "dlt.h" /* Needed for DLT Logs */ diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h index 0e7a356..efef08a 100644 --- a/include/dlt/dlt_offline_trace.h +++ b/include/dlt/dlt_offline_trace.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt_offline_trace.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_offline_trace.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h index df5a33d..9c5ea35 100755 --- a/include/dlt/dlt_protocol.h +++ b/include/dlt/dlt_protocol.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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/. - * - * - * \author Alexander Wenzel BMW 2011-2012 + * 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/. * - * \file dlt_protocal.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_protocol.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_shm.h b/include/dlt/dlt_shm.h index f8b821a..463e1c1 100644 --- a/include/dlt/dlt_shm.h +++ b/include/dlt/dlt_shm.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt_shm.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_shm.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_types.h b/include/dlt/dlt_types.h index b66e518..819c25c 100755 --- a/include/dlt/dlt_types.h +++ b/include/dlt/dlt_types.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt_types.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_types.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h index 10de203..ff73910 100644 --- a/include/dlt/dlt_user.h +++ b/include/dlt/dlt_user.h @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt_user.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_user.h +*/ /******************************************************************************* ** ** diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h index 23a6f49..e79f712 100644 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 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 BMW 2011-2012 - * - * \file dlt_user_macros.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_user_macros.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_user_macros.h ** -- cgit v1.2.1