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>

8 files changed, 85 insertions, 144 deletions

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 6668793..af8472d 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/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 <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@
-########q
+#######
 
 set(dlt_LIB_SRCS dlt_user dlt_client dlt_filetransfer ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c)
 
diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c
index d5f81e9..210d303 100755
--- a/src/lib/dlt_client.c
+++ b/src/lib/dlt_client.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 <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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_client.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 /*******************************************************************************
diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h
index 6b490e7..d4d8a35 100755
--- a/src/lib/dlt_client_cfg.h
+++ b/src/lib/dlt_client_cfg.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 <alexander.aw.wenzel@bmw.de>
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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_client_cfg.h
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 
diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c
index 43047e3..f3ba2db 100644
--- a/src/lib/dlt_filetransfer.c
+++ b/src/lib/dlt_filetransfer.c
@@ -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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_filetransfer.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 dlt_filetransfer.c
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 95bcf8d..97e780e 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.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 <alexander.aw.wenzel@bmw.de>
  * Markus Klein <Markus.Klein@esk.fraunhofer.de>
  * Mikko Rapeli <mikko.rapeli@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 dlt_user.c
- * For further information see http://www.genivi.org/.
- * @licence end@
  */
 
 #include <stdlib.h> /* for getenv(), free(), atexit() */
diff --git a/src/lib/dlt_user.c.rej b/src/lib/dlt_user.c.rej
deleted file mode 100644
index c197d0d..0000000
--- a/src/lib/dlt_user.c.rej
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/lib/dlt_user.c
-+++ src/lib/dlt_user.c
-@@ -501,48 +501,21 @@ int dlt_user_atexit_blow_out_user_buffer(void){
- 
- 	uint32_t exitTime = dlt_uptime() + DLT_USER_ATEXIT_RESEND_BUFFER_EXIT_TIMEOUT;
- 
--	/* Send content of ringbuffer */
--	DLT_SEM_LOCK();
--	count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer));
--	DLT_SEM_FREE();
--    
--    if (count > 0)
--    {
--        while(dlt_uptime() < exitTime )
--        {
--            if (dlt_user.dlt_log_handle == -1)
--            {
--                /* Reattach to daemon if neccesary */
--                dlt_user_log_reattach_to_daemon();
-+	while(dlt_uptime() < exitTime ){
- 
--                if ((dlt_user.dlt_log_handle != -1) && (dlt_user.overflow_counter))
--                {
--                    if (dlt_user_log_send_overflow()==0)
--                    {
--				        snprintf(str,DLT_USER_BUFFER_LENGTH,"%u messages discarded!\n",dlt_user.overflow_counter);
--				        dlt_log(LOG_WARNING, str);
--                        dlt_user.overflow_counter=0;
--                    }
--                }
--            } 
--            
--            if (dlt_user.dlt_log_handle != -1)
--            {
--		        ret = dlt_user_log_resend_buffer();
-+		ret = dlt_user_log_resend_buffer();
- 
--		        if(ret == 0)
--		        {
--				        return 0;
--		        }
--	        }
-+		if(ret == 0)
-+		{
-+				return 0;
-+		}
- 
--		    usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP);
--	    }
-+		usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP);
-+	}
- 
--	    DLT_SEM_LOCK();
--	    count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer));
--	    DLT_SEM_FREE();
--    }
-+	DLT_SEM_LOCK();
-+	count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer));
-+	DLT_SEM_FREE();
- 
- 	return count;
- }
diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h
index 124be44..b9eeb8a 100755
--- a/src/lib/dlt_user_cfg.h
+++ b/src/lib/dlt_user_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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_user_cfg.h
  * 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 dlt_user_cfg.h
+ */
 
 /*******************************************************************************
 **                                                                            **
diff --git a/src/lib/dlt_user_cfg.h.rej b/src/lib/dlt_user_cfg.h.rej
deleted file mode 100644
index a722e78..0000000
--- a/src/lib/dlt_user_cfg.h.rej
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/lib/dlt_user_cfg.h
-+++ src/lib/dlt_user_cfg.h
-@@ -126,11 +126,11 @@
- /* Name of environment variable for local print mode */

- #define DLT_USER_ENV_LOCAL_PRINT_MODE "DLT_LOCAL_PRINT_MODE"

- 

--/* Timeout offset for resending user buffer at exit in 10th milliseconds (10000 = 1s)*/

-+/* Timeout offset for resending user buffer at exit in usec (1000 usec = 1ms)*/

- #define DLT_USER_ATEXIT_RESEND_BUFFER_EXIT_TIMEOUT 100000

- 

- /* Sleeps between resending user buffer at exit in usec (1000 usec = 1ms)*/

--#define DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP 100000

-+#define DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP 1000

- 

- 

- /************************/