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 --- src/daemon/CMakeLists.txt | 19 ++++++++++--------- src/daemon/dlt-daemon.c | 26 +++++++++++++++----------- src/daemon/dlt-daemon.h | 26 +++++++++++++++----------- src/daemon/dlt-daemon_cfg.h | 27 +++++++++++++++------------ src/daemon/dlt_daemon_client.c | 27 ++++++++++++++++----------- src/daemon/dlt_daemon_client.h | 28 ++++++++++++++++------------ src/daemon/dlt_daemon_common.c | 26 +++++++++++++++----------- src/daemon/dlt_daemon_common.h | 26 +++++++++++++++----------- src/daemon/dlt_daemon_common_cfg.h | 28 ++++++++++++++++------------ src/daemon/dlt_daemon_serial.c | 27 ++++++++++++++++----------- src/daemon/dlt_daemon_serial.h | 26 +++++++++++++++----------- src/daemon/dlt_daemon_socket.c | 27 +++++++++++++++++---------- src/daemon/dlt_daemon_socket.h | 26 +++++++++++++++----------- 13 files changed, 196 insertions(+), 143 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 42d2081..46a087a 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/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@ -######## +####### if(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD) diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 8a17c55..302a613 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1,26 +1,30 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt-daemon.c - * For further information see http://www.genivi.org/. - * @licence end@ */ #include diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h index d6cb91f..f917555 100755 --- a/src/daemon/dlt-daemon.h +++ b/src/daemon/dlt-daemon.h @@ -1,23 +1,27 @@ -/** +/* * @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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-daemon.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h index 07e68c7..acddd45 100755 --- a/src/daemon/dlt-daemon_cfg.h +++ b/src/daemon/dlt-daemon_cfg.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-daemon_cfg.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-daemon_cfg.h + */ /******************************************************************************* ** ** diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index 6fde373..1b76b2c 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -1,26 +1,31 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt_daemon_client.c - * For further information see http://www.genivi.org/. - * @licence end@ - */ +*/ #include #include diff --git a/src/daemon/dlt_daemon_client.h b/src/daemon/dlt_daemon_client.h index 380f78c..fba4eb3 100644 --- a/src/daemon/dlt_daemon_client.h +++ b/src/daemon/dlt_daemon_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_daemon_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_daemon_client.h +*/ + /******************************************************************************* ** ** diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index ce6af70..31e228b 100644 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -1,23 +1,27 @@ -/** +/* * @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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_common.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h index 4807407..a0dba90 100644 --- a/src/daemon/dlt_daemon_common.h +++ b/src/daemon/dlt_daemon_common.h @@ -1,23 +1,27 @@ -/** +/* * @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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_common.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h index 914767a..b237b60 100755 --- a/src/daemon/dlt_daemon_common_cfg.h +++ b/src/daemon/dlt_daemon_common_cfg.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_daemon_common_cfg.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_daemon_common_cfg.h +*/ + /******************************************************************************* diff --git a/src/daemon/dlt_daemon_serial.c b/src/daemon/dlt_daemon_serial.c index 36bf049..bcacdd6 100644 --- a/src/daemon/dlt_daemon_serial.c +++ b/src/daemon/dlt_daemon_serial.c @@ -1,22 +1,27 @@ -/* @licence app begin@ - * Copyright (C) 2012 BMW AG +/* + * @licence app begin@ + * 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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_serial.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/daemon/dlt_daemon_serial.h b/src/daemon/dlt_daemon_serial.h index 928abc2..a12ab7b 100644 --- a/src/daemon/dlt_daemon_serial.h +++ b/src/daemon/dlt_daemon_serial.h @@ -1,23 +1,27 @@ -/** +/* * @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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_serial.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c index 146d952..4ba5c08 100644 --- a/src/daemon/dlt_daemon_socket.c +++ b/src/daemon/dlt_daemon_socket.c @@ -1,26 +1,33 @@ -/* @licence app begin@ - * Copyright (C) 2012-2014 BMW AG +/* + * @licence app begin@ + * 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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt_daemon_socket.c - * For further information see http://www.genivi.org/. - * @licence end@ */ + #include #include #include /* for printf() and fprintf() */ diff --git a/src/daemon/dlt_daemon_socket.h b/src/daemon/dlt_daemon_socket.h index 1ab7346..51f82fc 100644 --- a/src/daemon/dlt_daemon_socket.h +++ b/src/daemon/dlt_daemon_socket.h @@ -1,23 +1,27 @@ -/** +/* * @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/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_socket.h - * For further information see http://www.genivi.org/. - * @licence end@ */ -- cgit v1.2.1