diff options
| author |   takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 13:53:34 +0900 |
|---|---|---|
| committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 13:53:34 +0900 |
| commit | 138dfbb94e990dd14bb8ea08afd29ebfa573271b (patch) | |
| tree | 327a18b846734990dd83fd56b5fc582c5020e93c | |
| parent | 743e39eb1c5ab4fb1d6ab94aeb673e8ac463c243 (diff) | |
ns-frameworkunified branch 0.1sandbox/ToshikazuOhiwa/ns-frameworkunified
243 files changed, 497 insertions, 321 deletions
diff --git a/framework_unified/Makefile.client b/framework_unified/Makefile.client index e17e2d38..69ea68dd 100644 --- a/framework_unified/Makefile.client +++ b/framework_unified/Makefile.client @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/Makefile b/framework_unified/client/Makefile index 652c3371..29ed6284 100644 --- a/framework_unified/client/Makefile +++ b/framework_unified/client/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -246,7 +246,6 @@ LDFLAGS += -Wl,--no-as-needed LDLIBS += -Wl,-Bdynamic -lstdc++ LDLIBS += -Wl,-Bdynamic -lrt LDLIBS += -Wl,-Bdynamic -lPosixBasedOS001legacy -LDLIBS += -Wl,-Bdynamic -lvp LDLIBS += -Wl,-Bdynamic -lcommon LINK_SHLIB_CXX = Y @@ -261,9 +260,10 @@ SUBDIRS := NS_XMLConfigeParser NS_Utility all: install-data:install_cfg + install -d -m 775 $(DESTDIR)/nv/BS/ns/framework_unified/rwdata install_cfg: - install -d -m 775 $(DESTDIR)/usr/agl/conf/ns_logger - install -m 644 -t $(DESTDIR)/usr/agl/conf/ns_logger NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg + install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata + install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg include ../../native_service.mk diff --git a/framework_unified/client/NS_ConfigParser/cfg/depends.mk b/framework_unified/client/NS_ConfigParser/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_ConfigParser/cfg/depends.mk +++ b/framework_unified/client/NS_ConfigParser/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h b/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h index 04da2c96..64aad8b0 100644 --- a/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h +++ b/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h b/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h index bf178e31..8d7a47fd 100644 --- a/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h +++ b/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h b/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h index f91f060f..d47c04b1 100644 --- a/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h +++ b/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h b/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h index b0a2645e..58d16399 100644 --- a/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h +++ b/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h b/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h index f89e90ee..c48f09d7 100644 --- a/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h +++ b/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001 index 80266094..1e6e556b 100644 --- a/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp b/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp index 05118f2d..a2abd785 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp b/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp index 50c21ee4..9eeb3c00 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp b/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp index b5b354e5..4bf16d5f 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp b/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp index 18e8c512..839053af 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp b/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp index 2f053c94..6c2b2d6e 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp b/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp index 7ab3506b..601500de 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp b/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp index 85613c18..ff3cc7a4 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp b/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp index 6d102ddb..b2b52f08 100644 --- a/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp +++ b/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/cfg/depends.mk b/framework_unified/client/NS_FrameworkCore/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_FrameworkCore/cfg/depends.mk +++ b/framework_unified/client/NS_FrameworkCore/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h index d524c32d..cb8bcee7 100644 --- a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h +++ b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp index 8b73379f..8599fb22 100644 --- a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp +++ b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h index 4eb476ed..4d38828a 100644 --- a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h +++ b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h index dc6f623e..b78297e3 100644 --- a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h +++ b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h index 4f4eac05..f512e760 100644 --- a/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h +++ b/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h b/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h index 4f39d9b1..20ed3f62 100644 --- a/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h +++ b/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h b/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h index a6263d5b..ea564df7 100644 --- a/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h +++ b/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h b/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h index 34fb7267..ff670295 100644 --- a/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h +++ b/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp index f9837423..250edce2 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -269,7 +269,7 @@ EFrameworkunifiedStatus FrameworkunifiedCreateDispatcher(PCSTR cAppName, HANDLE ////////////////////////////////////////// EFrameworkunifiedStatus FrameworkunifiedDispatchBlock(HANDLE hApp) { EFrameworkunifiedStatus eStatus = eFrameworkunifiedStatusOK; - FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "+"); +// FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "+"); if (frameworkunifiedCheckValidAppHandle(hApp)) { CFrameworkunifiedFrameworkApp *pApp = static_cast<CFrameworkunifiedFrameworkApp *>(hApp); @@ -281,14 +281,14 @@ EFrameworkunifiedStatus FrameworkunifiedDispatchBlock(HANDLE hApp) { FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __FUNCTION__, "Error :: (%d) Failed on McReceive", eStatus); // LCOV_EXCL_BR_STOP } else { - FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message received on dispatcher:: Source: %s, Cmd: 0x%X, SessionId: %d ", - pApp->cMsgSrcName, pApp->uiProtocolCmd, pApp->uiSessionId); +// FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message received on dispatcher:: Source: %s, Cmd: 0x%X, SessionId: %d ", +// pApp->cMsgSrcName, pApp->uiProtocolCmd, pApp->uiSessionId); } } else { eStatus = eFrameworkunifiedStatusInvldHandle; } - FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "-"); +// FRAMEWORKUNIFIEDLOG0(ZONE_NS_DIS, __FUNCTION__, "-"); return eStatus; } @@ -442,14 +442,18 @@ static void frameworkunifiedPrintRusage(HANDLE hApp, const struct rusage &start, pApp->max_occupy_time = occupy_time; } - FRAMEWORKUNIFIEDLOG(ZONE_NS_DEBUG_DUMP, __FUNCTION__, "cur:%d.%06d avg:%d.%06d max:%d.%06d", - occupy_time / 1000000, occupy_time % 1000000, - average / 1000000, average % 1000000, - pApp->max_occupy_time / 1000000, pApp->max_occupy_time % 1000000); +// FRAMEWORKUNIFIEDLOG(ZONE_NS_DEBUG_DUMP, __FUNCTION__, "cur:%d.%06d avg:%d.%06d max:%d.%06d", +// occupy_time / 1000000, occupy_time % 1000000, +// average / 1000000, average % 1000000, +// pApp->max_occupy_time / 1000000, pApp->max_occupy_time % 1000000); } static inline void frameworkunifiedGetRusage(struct rusage *r) { + if (r == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "r is NULL"); + return; + } memset(r, 0, sizeof(struct rusage)); if (getrusage(RUSAGE_THREAD, r) == -1) { // LCOV_EXCL_BR_START 15:marco defined in "native_service/ns_logger_if.h" @@ -820,10 +824,10 @@ EFrameworkunifiedStatus FrameworkunifiedDispatchProcess(HANDLE hApp) { FrameworkunifiedClearMsgData(hApp); eStatus = eFrameworkunifiedStatusOK; } else { - FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message processed. Status (0x%X) ::" - " Source: %s Command: 0x%x SessionId: %d.", - eStatus, pApp->cMsgSrcName != 0 ? pApp->cMsgSrcName : NULL, - pApp->uiProtocolCmd, pApp->uiSessionId); +// FRAMEWORKUNIFIEDLOG(ZONE_NS_DIS, __FUNCTION__, "Message processed. Status (0x%X) ::" +// " Source: %s Command: 0x%x SessionId: %d.", +// eStatus, pApp->cMsgSrcName != 0 ? pApp->cMsgSrcName : NULL, +// pApp->uiProtocolCmd, pApp->uiSessionId); } if (enable_rusage == TRUE) { @@ -1367,6 +1371,10 @@ EFrameworkunifiedStatus FrameworkunifiedDestroyDispatcherWithoutLoop(HANDLE hApp } static EFrameworkunifiedStatus GetDispatcherMqFD(HANDLE hApp, int *fd) { + if (fd == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "fd is NULL"); + return eFrameworkunifiedStatusNullPointer; + } EFrameworkunifiedStatus eStatus = eFrameworkunifiedStatusOK; if (frameworkunifiedCheckValidAppHandle(hApp)) { diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp index c7a8c77c..cb573c97 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp index 34773a27..cf079222 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp index 160003ef..29125271 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp index e9b42429..ea953c98 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp index 5ec8c526..063e3572 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp index 3b6fd912..7c9935be 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp index ea9b8e2e..80eec1fe 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp index 878cae7a..3a2d434a 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp index 76200bbf..468478ca 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp index 8c7a8853..986f3b34 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -153,6 +153,10 @@ EFrameworkunifiedStatus setChildThreadSched(EFrameworkunifiedSchedPolicy policy, /// child_thread_proc //////////////////////////////////////////////////////////////////////////////////////////// void *child_thread_proc(void *args) { + if (args == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "args is NULL"); + return NULL; + } PCData pcdata = *reinterpret_cast< PCData * >(args); // Create a local copy of data try { diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp index 849ee562..dccffa8c 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp index 29919f7f..88b5c501 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp index 58dfd5f5..0663b858 100644 --- a/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 index 4263bdd7..025ec700 100644 --- a/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp index 8b76e85f..0cb4d670 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp index 7830361e..d975e930 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp index 026f9583..6f273190 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp index 19f50bac..baac0d46 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp index 9ccbb927..a73408a8 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp index 303720ac..294dcf55 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp index ab825e80..8b361fa4 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp index 7f3df6e3..dfb2d5cd 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp index 84324231..7afabdb6 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp index af2b68f9..96402769 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp index 029df416..f6cdb098 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp index bdd1435a..da060f2a 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -896,7 +896,7 @@ EFrameworkunifiedStatus CFrameworkunifiedHSMParentFramework::CsFrameworkunifiedR try { HANDLE l_pHApp = FrameworkunifiedGetAppHandle(); CHKNULL(l_pHApp); - if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { + if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) // Publish Service available this can also be published from FrameworkunifiedOnStart callback if (eFrameworkunifiedStatusOK != (FrameworkunifiedPublishServiceAvailability(l_pHApp, TRUE))) { FRAMEWORKUNIFIEDLOG(ZONE_NS_WAR, __FUNCTION__, "warning:Failed to Publish service availability notification:0x%x ", @@ -929,7 +929,7 @@ EFrameworkunifiedStatus CFrameworkunifiedHSMParentFramework::CsFrameworkunifiedR HANDLE l_pHApp = FrameworkunifiedGetAppHandle(); CHKNULL(l_pHApp); - if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { + if (FrameworkunifiedIsAutoPublishServiceAvailableEnabled()) { // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) // Publish Service available this can also be published from FrameworkunifiedOnStart callback if (eFrameworkunifiedStatusOK != (FrameworkunifiedPublishServiceAvailability(l_pHApp, FALSE))) { FRAMEWORKUNIFIEDLOG(ZONE_NS_WAR, __FUNCTION__, "Warning:Failed to set service availability notification:0x%x ", l_eStatus); diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp index 4a561bfc..6c44ebbb 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp index 1c285700..b5f9c0ae 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp index 30df607d..33dab562 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,6 +87,10 @@ EFrameworkunifiedStatus FrameworkunifiedCreateHSMDispatcherChild(PCSTR childName } void *child_hsm_thread_proc(void *args) { + if (args == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "args is NULL"); + return NULL; + } PCData pcdata = *reinterpret_cast< PCData * >(args); // Create a local copy of data try { diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp index 2c64a1a2..a8289a0a 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp index 1334fc61..97b6e3bb 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp index bf73e663..af90583b 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp index c37397bc..1162f61b 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile b/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile index ae3774a9..964a1f50 100644 --- a/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile +++ b/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Logger/cfg/depends.mk b/framework_unified/client/NS_Logger/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_Logger/cfg/depends.mk +++ b/framework_unified/client/NS_Logger/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Logger/include/frameworkunified_stub.h b/framework_unified/client/NS_Logger/include/frameworkunified_stub.h index 9ff90b31..22630385 100644 --- a/framework_unified/client/NS_Logger/include/frameworkunified_stub.h +++ b/framework_unified/client/NS_Logger/include/frameworkunified_stub.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Logger/include/ns_logger_internal.h b/framework_unified/client/NS_Logger/include/ns_logger_internal.h index 0bcbec88..97bde912 100644 --- a/framework_unified/client/NS_Logger/include/ns_logger_internal.h +++ b/framework_unified/client/NS_Logger/include/ns_logger_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001 index c6b2be8b..25318bee 100644 --- a/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Logger/src/ns_logger.cpp b/framework_unified/client/NS_Logger/src/ns_logger.cpp index b7f26be3..94f775ce 100644 --- a/framework_unified/client/NS_Logger/src/ns_logger.cpp +++ b/framework_unified/client/NS_Logger/src/ns_logger.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,6 @@ #include <native_service/ns_logger_if.h> #include <native_service/ns_eventlogger.h> #include <native_service/cl_lockid.h> -#include <other_service/VP_GetEnv.h> #ifdef AGL_STUB #include <other_service/strlcat.h> @@ -107,10 +106,12 @@ FRAMEWORKUNIFIEDLOGSYSEVENTPARAM g_FrameworkunifiedLogSysEventParams = {FALSE}; #define ZONEMASK_MAX BITS_IN_TZONE // ((UI_32)(BITS_IN_TZONE * TZONE_COUNT)) #define FRAMEWORKUNIFIEDLOG_DEFAULT_FLAG_ID (0) -#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/usr/agl/conf/ns_logger/ns_logger_frameworkunifiedlog__CWORD84_.cfg" +#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/usr/agl/conf/BS/ns/framework_unified/rodata/ns_logger_frameworkunifiedlog__CWORD84_.cfg" #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__TMP "ns_logger_frameworkunifiedlog__CWORD84_.tmp" #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV "ns_logger_frameworkunifiedlog__CWORD84_.cfg" +#define FRAMEWORKUNIFIEDLOG_CONFIG_NV "/nv/BS/ns/framework_unified/rwdata/" + #define FRAMEWORKUNIFIEDLOG_CONFIG_TMP_NV "ns_logger_frameworkunifiedlog_tmp.cfg" #ifndef TN_LOGGERRTIME #define TN_LOGGERRTIME "LoggerRtime" @@ -148,8 +149,7 @@ static UI_32 g_FrameworkunifiedLogFlagId = FRAMEWORKUNIFIEDLOG_DEFAULT_FLAG_ID; static bool g_FrameworkunifiedLogFlagRealTimeLog = TRUE; pthread_mutex_t FrameworkunifiedLogMtx = PTHREAD_MUTEX_INITIALIZER; -#define ENABLE_DEBUG_SYSLOG 1 -#if ENABLE_DEBUG_SYSLOG // for FRAMEWORKUNIFIED_SET_ZONES() error +#ifdef ENABLE_DEBUG_SYSLOG // for FRAMEWORKUNIFIED_SET_ZONES() error #define DEB_SYSLOG(fmt, ...) {openlog(0, LOG_PID, LOG_USER); \ syslog(LOG_ERR, "[FRAMEWORKUNIFIEDLOG][ERR]EXE_LINK_PATH(%s)[%s:L%d] " fmt, exe_link_path, \ __FUNCTION__, __LINE__, ## __VA_ARGS__); \ @@ -160,6 +160,10 @@ pthread_mutex_t FrameworkunifiedLogMtx = PTHREAD_MUTEX_INITIALIZER; static UI_32 GetFrameworkunifiedLogRealtimeUartOutput(CNSConfigReader *cfg_reader) { + if (cfg_reader == NULL) { + return -1; + } + std::string output_str = cfg_reader->GetString("REALTIME_LOG.Output"); // LCOV_EXCL_BR_LINE 11:expect branch if (output_str.compare("UART") == 0) { @@ -183,6 +187,10 @@ GetFrameworkunifiedLogZoneFileInfo(CNSConfigReader *cfg_reader, std::string &nam std::string zone_force_output_key = name; // LCOV_EXCL_BR_LINE 11:expect branch zone_force_output_key.append(".ForceOutput"); + if (cfg_reader == NULL) { + return eFrameworkunifiedStatusNullPointer; + } + tbl.ring_buffer = NULL; tbl.file_name = cfg_reader->GetString(zone_filename_key); tbl.size = static_cast<UI_32>(cfg_reader->GetInt(zone_filesize_key)); @@ -207,6 +215,9 @@ GetFrameworkunifiedLogFlagFileInfo(CNSConfigReader *cfg_reader, std::string &nam std::string flag_real_time_log_key = name; flag_real_time_log_key.append(".Realtimelog"); + if (cfg_reader == NULL) { + return eFrameworkunifiedStatusNullPointer; + } tbl.ring_buffer = NULL; tbl.file_name = cfg_reader->GetString(flag_filename_key); // LCOV_EXCL_BR_LINE 11:expect branch @@ -234,6 +245,10 @@ GetFrameworkunifiedLogFlagFileInfo(CNSConfigReader *cfg_reader, std::string &nam static VOID GetFrameworkunifiedLogList(CNSConfigReader *cfg_reader, std::vector<std::string> &list, // NOLINT (readability/nolint) std::string req_list) { + if (cfg_reader == NULL) { + return; + } + std::string list_str = cfg_reader->GetString(req_list); if (!list_str.empty()) { try { @@ -268,6 +283,10 @@ IsDefinedFrameworkunifiedLogFlag(CNSConfigReader *cfg_reader, std::string &flag_ UI_32 cnt = 1; size_t pos1; + if (cfg_reader == NULL) { + return FALSE; + } + while (1) { std::string service_key = flag_name; std::ostringstream service_num; // LCOV_EXCL_BR_LINE 11:expect branch @@ -378,6 +397,11 @@ CreateFrameworkunifiedLogFileTbl(CNSConfigReader *cfg_reader, std::string &exe_s static VOID GetFrameworkunifiedLogRingBuffer(const UI_16 zone, CNSRingBuffer **ring_buf) { TFrameworkunifiedLogMap::iterator itr = g_FrameworkunifiedLogMap.find(zone); + + if (ring_buf == NULL) { + return; + } + if (itr == g_FrameworkunifiedLogMap.end()) { itr = g_FrameworkunifiedLogFlagMap.find(g_FrameworkunifiedLogFlagId); if (itr == g_FrameworkunifiedLogFlagMap.end()) { @@ -443,6 +467,10 @@ static inline void GetShmInfo(int flagId, int *realTimeLog, int *logLevel) { volatile ssize_t *p; + if ((realTimeLog == NULL) || (logLevel == NULL)) { + return; + } + p = static_cast<ssize_t *>(shm_pmap); *realTimeLog = static_cast<int>(p[0]); p += 2; @@ -462,6 +490,10 @@ NsLogIsZonePrintEnable(const UI_16 zone, UI_8 *mode) { int l_realTimeLog = FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_OFF; int l_loglevel = FRAMEWORKUNIFIEDLOG_FLAG_MODE_RELEASE; + if (mode == NULL) { + return FALSE; + } + GetShmInfo(g_FrameworkunifiedLogFlagId, &l_realTimeLog, &l_loglevel); *mode = static_cast<UI_8>(l_realTimeLog); if (l_realTimeLog == FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_OFF) { @@ -540,13 +572,14 @@ copyFrameworkunifiedLogCfgFileToNv(void) { char c[1]; ssize_t len; - std::string config_dirpath = PF_SYS_BS; - std::string config_tempname = PF_SYS_BS; // LCOV_EXCL_BR_LINE 11:expect branch - std::string config_filename = PF_SYS_BS; // LCOV_EXCL_BR_LINE 11:expect branch - + // LCOV_EXCL_BR_START 11:Excluded due to gcov constraints (others) + std::string config_dirpath = FRAMEWORKUNIFIEDLOG_CONFIG_NV; + std::string config_tempname = FRAMEWORKUNIFIEDLOG_CONFIG_NV; + std::string config_filename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; fd_in = open(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN, O_RDONLY); config_tempname.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__TMP); config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); + // LCOV_EXCL_BR_STOP 11:Excluded due to gcov constraints (others) if (fd_in == -1) { return; @@ -718,9 +751,10 @@ WriteSharedMemForFlagId(int realTimeLog, unsigned int flagIdNum, int flagId, static BOOL IsExistFrameworkunifiedLogCfgNv(void) { FILE *fp; - std::string config_filename = PF_SYS_BS; - + // LCOV_EXCL_BR_START 11:Excluded due to gcov constraints (others) + std::string config_filename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); + // LCOV_EXCL_BR_STOP 11:Excluded due to gcov constraints (others) fp = fopen(config_filename.c_str(), "re"); if (fp == NULL) { @@ -737,6 +771,10 @@ get_readlink_path(char *path) { CHAR buf[EXE_STR_LEN]; ssize_t len; + if (path == NULL) { + return -1; + } + path[0] = 0; if (exe_link_path[0] == 0) { pid_t pid = static_cast<pid_t>(syscall(__NR_getpid)); @@ -767,12 +805,14 @@ readConfig(int *realTimeLog, int **logLevelArray) { std::string config_filename; std::string exe_str = buf; // LCOV_EXCL_BR_LINE 11:expect branch + // LCOV_EXCL_BR_START 11:Excluded due to gcov constraints (others) if (IsExistFrameworkunifiedLogCfgNv()) { - config_filename = PF_SYS_BS; + config_filename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); } else { config_filename = FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN; } + // LCOV_EXCL_BR_STOP 11:Excluded due to gcov constraints (others) CNSConfigReader *config_reader = new CNSConfigReader(); // LCOV_EXCL_BR_LINE 11:expect branch if (config_reader != NULL) { // LCOV_EXCL_BR_LINE 5: new's error case if (config_reader->Parse(config_filename) @@ -874,6 +914,11 @@ NSLogGetFrameworkunifiedlogIndex(PCSTR filename) { UI_32 ConvertEndian(UI_32 *pvar) { UI_32 retVal = (UI_32)0; + + if (pvar == NULL) { + return retVal; + } + UI_32 var = *pvar; retVal = (((var & 0xFF000000) >> 24) | ((var & 0x00FF0000) >> 8) | @@ -1032,6 +1077,10 @@ _in_NsLog_part1(const UI_16 p_lLine_i, const UI_16 f_uiZoneIndex, int len; CHAR *p = format; + if (format == NULL) { + return NULL; + } + // fixed format : "%s%ld/%d/%s/%05d/%s/%d/=%s\r\n" // time_string _GetTimeString2(p); @@ -1095,10 +1144,18 @@ static void _in_NsLog_part2(const UI_16 f_uiZoneIndex, CHAR *p, CHAR *format) { UI_32 l_uiLength; + if (p == NULL) { + return; + } + *p++ = '\r'; *p++ = '\n'; *p = '\0'; + if (format == NULL) { + return; + } + l_uiLength = static_cast<UI_32>(p - format); // Write log message @@ -1274,16 +1331,20 @@ NsLogSetFrameworkunifiedLogParams(FRAMEWORKUNIFIEDLOGPARAM *p_FrameworkunifiedLo int *l_logLevelArray = NULL; CHAR buf[EXE_STR_LEN]; + if (p_FrameworkunifiedLogParams == NULL) { + return; + } + get_readlink_path(buf); if (g_flag_name.empty()) { // LCOV_EXCL_BR_LINE 200:get_readlink_path can not return false std::string config_filename; CHAR buf[EXE_STR_LEN]; - if (IsExistFrameworkunifiedLogCfgNv()) { - config_filename = PF_SYS_BS; - config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); + if (IsExistFrameworkunifiedLogCfgNv()) { // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) + config_filename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) + config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) } else { - config_filename = FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN; + config_filename = FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN; // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) } if (get_readlink_path(buf)) { std::string exe_str = buf; // LCOV_EXCL_BR_LINE 11:expect branch @@ -1382,13 +1443,11 @@ NsLogGetControlMask(TFrameworkunifiedZoneMask p_Zonemask_i) { BOOL NsLogIsZoneSet(UI_32 set_zone) { int realTimeLog; - int logLevel; + int logLevel = 0; GetShmInfo(g_FrameworkunifiedLogFlagId, &realTimeLog, &logLevel); -#pragma GCC diagnostic push // for warning remove (compiler Bug?) -#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + if (logLevel == FRAMEWORKUNIFIEDLOG_FLAG_MODE_DEBUG) -#pragma GCC diagnostic pop { return TRUE; } @@ -1506,6 +1565,10 @@ void NsLogParseZones(FRAMEWORKUNIFIEDLOGPARAM *p_FrameworkunifiedLogParams, UI_32 f_uiZoneCount, ...) { va_list l_tArguments; + if (p_FrameworkunifiedLogParams == NULL) { + return; + } + // Initialize the variable argument list va_start(l_tArguments, f_uiZoneCount); @@ -1767,7 +1830,7 @@ NSLogSetPlogOutputOptions(UI_8 f_uiPlogOutputOption) { ////////////////////////////////////////// VOID NsLogInitialize(void) { - std::string config_filename = PF_SYS_BS; + std::string config_filename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); // LCOV_EXCL_BR_LINE 11:expect branch int l_realTimelog; @@ -1793,9 +1856,8 @@ static void writeUpdateConfigForString(std::string &name, // NOLINT (readabili std::string flag_loglevel_key = name; flag_loglevel_key.append(set_key); - std::string config_filename = PF_SYS_BS; // LCOV_EXCL_BR_LINE 11:expect branch - - std::string config_tmpfilename = PF_SYS_BS; + std::string config_filename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; // LCOV_EXCL_BR_LINE 11:expect branch + std::string config_tmpfilename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); // LCOV_EXCL_BR_LINE 11:expect branch config_tmpfilename.append(FRAMEWORKUNIFIEDLOG_CONFIG_TMP_NV); @@ -1830,11 +1892,9 @@ static void writeUpdateConfigForString(std::string &name, // NOLINT (readabili static void writeUpdateConfig(std::string set_key, std::string value) { - std::string config_filename = PF_SYS_BS; - - std::string config_tmpfilename = PF_SYS_BS; - config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); - + std::string config_filename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) + std::string config_tmpfilename = FRAMEWORKUNIFIEDLOG_CONFIG_NV; // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) + config_filename.append(FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV); // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) config_tmpfilename.append(FRAMEWORKUNIFIEDLOG_CONFIG_TMP_NV); unlink(config_tmpfilename.c_str()); @@ -1873,7 +1933,7 @@ NsLogSetFrameworkunifiedLogFlag(UI_8 flag_id, UI_8 mode) { return; } - if (!IsExistFrameworkunifiedLogCfgNv()) { + if (!IsExistFrameworkunifiedLogCfgNv()) { // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) copyFrameworkunifiedLogCfgFileToNv(); // LCOV_EXCL_BR_LINE 11:expect branch } @@ -1916,7 +1976,7 @@ NsLogSetFrameworkunifiedLogFlag(UI_8 flag_id, UI_8 mode) { EFrameworkunifiedStatus NsLogGetFrameworkunifiedLogFlag(UI_8 flag_id, UI_8 *mode) { int l_realTimeLog; - int l_logLevel; + int l_logLevel = 0; int *l_logLevelArray; if (mode == NULL) { @@ -1946,10 +2006,8 @@ NsLogGetFrameworkunifiedLogFlag(UI_8 flag_id, UI_8 *mode) { } GetShmInfo(flag_id, &l_realTimeLog, &l_logLevel); -#pragma GCC diagnostic push // for warning remove (compiler Bug?) -#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" *mode = static_cast<UI_8>(l_logLevel); -#pragma GCC diagnostic pop + return eFrameworkunifiedStatusOK; } @@ -1973,7 +2031,7 @@ NsLogSetRealtimeLog(UI_8 mode) { return; } - if (!IsExistFrameworkunifiedLogCfgNv()) { + if (!IsExistFrameworkunifiedLogCfgNv()) { // LCOV_EXCL_BR_LINE 11:Excluded due to gcov constraints (others) copyFrameworkunifiedLogCfgFileToNv(); // LCOV_EXCL_BR_LINE 11:expect branch } diff --git a/framework_unified/client/NS_Logger/tool/nslogsw.cpp b/framework_unified/client/NS_Logger/tool/nslogsw.cpp index ebe30aed..b81b4a6e 100644 --- a/framework_unified/client/NS_Logger/tool/nslogsw.cpp +++ b/framework_unified/client/NS_Logger/tool/nslogsw.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageCenter/cfg/depends.mk b/framework_unified/client/NS_MessageCenter/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_MessageCenter/cfg/depends.mk +++ b/framework_unified/client/NS_MessageCenter/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h b/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h index d53db53e..2b6dae89 100644 --- a/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h +++ b/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h b/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h index 267e3590..a99e8119 100644 --- a/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h +++ b/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001 index cfe15a70..c654ef76 100644 --- a/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageCenter/src/ns_message_center.c b/framework_unified/client/NS_MessageCenter/src/ns_message_center.c index 32510f37..fe841285 100644 --- a/framework_unified/client/NS_MessageCenter/src/ns_message_center.c +++ b/framework_unified/client/NS_MessageCenter/src/ns_message_center.c @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -94,6 +94,10 @@ HANDLE McOpenSyncSender(PCSTR name) { static int mcSetMonitorName(char *str, PCSTR name) { int len; + if (str == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "str is NULL"); + return -1; + } *str = '\0'; len = sprintf(str + 1, "monitorS_%s", name != 0 ? name : NULL); return len + 1; @@ -162,6 +166,10 @@ int mcCloseMonitor(PCSTR name) { static int mcSetClientName(char *str, PCSTR serverName, PCSTR clientName) { int len; + if (str == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "str is NULL"); + return -1; + } *str = '\0'; len = sprintf(str + 1, "monitorC_%s:%s", serverName != 0 ? serverName : NULL, clientName != 0 ? clientName : NULL); return len + 1; @@ -208,6 +216,10 @@ error: int mcSetConnectKey(char *buf, size_t size, PCSTR serverName, PCSTR clientName) { int len = snprintf(buf, size, "%s:%s", serverName != 0 ? serverName : NULL, clientName != 0 ? clientName : NULL); + if (buf == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "buf is NULL"); + return -1; + } buf[size - 1] = '\0'; return len; } @@ -252,6 +264,10 @@ int mcCloseConnectMonitor(PCSTR serverName, PCSTR clientName) { // LCOV_EXCL_ST static void mcGetClientName(const char *str, char *client_name, size_t size, int pathlen) { size_t len = size - 1; size_t str_len; + if (str == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "str is NULL"); + return; + } char *p_div = strchr(str + 1, ':'); if (p_div == NULL) { return; @@ -260,6 +276,10 @@ static void mcGetClientName(const char *str, char *client_name, size_t size, int if (len > str_len) { len = str_len; } + if (client_name == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "client_name is NULL"); + return; + } strncpy(client_name, p_div + 1, len); client_name[len] = '\0'; } @@ -643,6 +663,10 @@ static inline char *ultoa(unsigned long value, char *buf, int radix) { *--p = c[value % (unsigned long)radix]; value /= (unsigned long)radix; } while (value); + if (buf == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "buf is NULL"); + return NULL; + } strcpy(buf, p); return buf; diff --git a/framework_unified/client/NS_MessageQueue/cfg/depends.mk b/framework_unified/client/NS_MessageQueue/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_MessageQueue/cfg/depends.mk +++ b/framework_unified/client/NS_MessageQueue/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h b/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h index c828d742..5b02e2b2 100644 --- a/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h +++ b/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h b/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h index 0e73306b..ca022181 100644 --- a/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h +++ b/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h b/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h index 0719c496..111b5bec 100644 --- a/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h +++ b/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001 index eb1ec996..054db6dc 100644 --- a/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c b/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c index 789d82ee..8749a990 100644 --- a/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c +++ b/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,17 @@ */ #include <string.h> +#include <native_service/ns_logger_if.h> size_t strlcpy(char *dst, const char *src, size_t siz) { + if (dst == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "dst is NULL"); + return 0; + } + if (src == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "src is NULL"); + return 0; + } size_t ret = strlen(src); if (siz) { @@ -28,6 +37,14 @@ size_t strlcpy(char *dst, const char *src, size_t siz) { } size_t strlcat(char *dst, const char *src, size_t siz) { + if (dst == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "dst is NULL"); + return 0; + } + if (src == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "src is NULL"); + return 0; + } size_t dsiz = strlen(dst); size_t len = strlen(src); size_t res = dsiz + len; diff --git a/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c b/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c index da3744b0..19900617 100644 --- a/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c +++ b/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ #include <other_service/strlcat.h> const UI_32 DEFAULT_MSG_PRIORITY = 10; -const UI_32 MAX_MESSAGES_STORED_IN_QUEUE = 128; +const UI_32 MAX_MESSAGES_STORED_IN_QUEUE = 256; const UI_32 MAX_SYNC_RESPONSE_STORED_IN_QUEUE = 2; //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/framework_unified/client/NS_NPServiceIf/cfg/depends.mk b/framework_unified/client/NS_NPServiceIf/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_NPServiceIf/cfg/depends.mk +++ b/framework_unified/client/NS_NPServiceIf/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h b/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h index ddcda618..469b4c03 100644 --- a/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h +++ b/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001 index 7db4d889..cbfc140f 100644 --- a/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c b/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c index ae3af6b3..d41514d1 100644 --- a/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c +++ b/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp b/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp index 6c9bd6d5..a7777432 100644 --- a/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp +++ b/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp b/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp index 2644cbc6..5122e39d 100644 --- a/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp +++ b/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,6 +65,10 @@ int frameworkunifiedGetResource(const char *mod, const char *key, long *resource if (r == NULL) { return -1; } + if (resource == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "resource is NULL"); + return -1; + } *resource = r->resource; return 0; } diff --git a/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp b/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp index d50037fd..1fbc5b57 100644 --- a/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp +++ b/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp b/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp index a3db58cd..89c7421b 100644 --- a/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp +++ b/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_SharedMemIf/cfg/depends.mk b/framework_unified/client/NS_SharedMemIf/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_SharedMemIf/cfg/depends.mk +++ b/framework_unified/client/NS_SharedMemIf/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001 index 85937994..dc225c4a 100644 --- a/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp b/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp index 9053e902..e60a4047 100644 --- a/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp +++ b/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,6 +48,10 @@ static size_t uitoa(unsigned int value, char *buf) { static const char c[] = "0123456789abcdef"; int i; + if (buf == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "buf is NULL"); + return 0; + } for (i = 0; i < 8; i++) { buf[i] = c[(value >> ((7 - i) * 4)) & 0xf]; } @@ -57,6 +61,10 @@ static size_t uitoa(unsigned int value, char *buf) { } static inline void create_shmname(char *buf, TMemID id) { + if (buf == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "buf is NULL"); + return; + } strcpy(buf, "nsshm_"); // NOLINT (readability/nolint) buf += sizeof("nsshm_") - 1; uitoa(id, buf); @@ -75,6 +83,15 @@ TMemID SetDataToShared(const void *data, UI_32 dataBytes, const char *from, cons FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "data is NULL"); return BAD_MEM_ID; } + if (from == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "from is NULL"); + return BAD_MEM_ID; + } + if (to == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "to is NULL"); + return BAD_MEM_ID; + } + if (dataBytes == 0) { FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "DataSize is invalied(%d)", dataBytes); return BAD_MEM_ID; diff --git a/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp b/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp index 266f2227..fe1e9bc4 100644 --- a/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp +++ b/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp b/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp index b7382fb0..79f9f543 100644 --- a/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp +++ b/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp b/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp index d9700112..25614157 100644 --- a/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp +++ b/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Timer/cfg/depends.mk b/framework_unified/client/NS_Timer/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_Timer/cfg/depends.mk +++ b/framework_unified/client/NS_Timer/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Timer/include/ns_timer_handle.h b/framework_unified/client/NS_Timer/include/ns_timer_handle.h index 87ddcd18..7d082e78 100644 --- a/framework_unified/client/NS_Timer/include/ns_timer_handle.h +++ b/framework_unified/client/NS_Timer/include/ns_timer_handle.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Timer/include/ns_timer_internal.h b/framework_unified/client/NS_Timer/include/ns_timer_internal.h index 5cf6f86a..43418a22 100644 --- a/framework_unified/client/NS_Timer/include/ns_timer_internal.h +++ b/framework_unified/client/NS_Timer/include/ns_timer_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001 index dd4fc0b6..b3eb74da 100644 --- a/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Timer/src/mod_version.c b/framework_unified/client/NS_Timer/src/mod_version.c index 6056f4a9..c6e28eb5 100644 --- a/framework_unified/client/NS_Timer/src/mod_version.c +++ b/framework_unified/client/NS_Timer/src/mod_version.c @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Timer/src/ns_timer.c b/framework_unified/client/NS_Timer/src/ns_timer.c index 769f1d20..d24264b1 100644 --- a/framework_unified/client/NS_Timer/src/ns_timer.c +++ b/framework_unified/client/NS_Timer/src/ns_timer.c @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Timer/src/ns_timer_class.cpp b/framework_unified/client/NS_Timer/src/ns_timer_class.cpp index a43058ca..47b41e9a 100644 --- a/framework_unified/client/NS_Timer/src/ns_timer_class.cpp +++ b/framework_unified/client/NS_Timer/src/ns_timer_class.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Utility/Makefile b/framework_unified/client/NS_Utility/Makefile index 4b05b12a..2f4dfef6 100644 --- a/framework_unified/client/NS_Utility/Makefile +++ b/framework_unified/client/NS_Utility/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Utility/buildversioncheck/Makefile b/framework_unified/client/NS_Utility/buildversioncheck/Makefile index 55d6e84d..03ca87c1 100644 --- a/framework_unified/client/NS_Utility/buildversioncheck/Makefile +++ b/framework_unified/client/NS_Utility/buildversioncheck/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile b/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile index 5f10ab26..e1b0a6d5 100644 --- a/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile +++ b/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp b/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp index daf87dd9..633797bf 100644 --- a/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp +++ b/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/cfg/depends.mk b/framework_unified/client/NS_UtilityCenter/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_UtilityCenter/cfg/depends.mk +++ b/framework_unified/client/NS_UtilityCenter/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h b/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h index 2ac71e3c..fc0b7616 100644 --- a/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h +++ b/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp b/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp index 2d42c885..8c71ace2 100644 --- a/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp +++ b/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp b/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp index a8cf1b96..3ee907f3 100644 --- a/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp +++ b/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001 index 90b41a8c..14ad4d80 100644 --- a/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp b/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp index 7e21367a..3dea53cb 100644 --- a/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp +++ b/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp b/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp index 32a0ab15..af823648 100644 --- a/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp +++ b/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp b/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp index 9a9272d0..a8b4263d 100644 --- a/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp +++ b/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp b/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp index d3a15c7d..d9e6776c 100644 --- a/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp +++ b/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/Makefile b/framework_unified/client/NS_XMLConfigeParser/Makefile index 14219ea7..1cc5e18b 100644 --- a/framework_unified/client/NS_XMLConfigeParser/Makefile +++ b/framework_unified/client/NS_XMLConfigeParser/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/Makefile b/framework_unified/client/NS_XMLConfigeParser/library/Makefile index d37502b3..520b5f72 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/Makefile +++ b/framework_unified/client/NS_XMLConfigeParser/library/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk b/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk +++ b/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h index efe74f39..4186f095 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h +++ b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h index 8fee1cff..6dcf11ad 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h +++ b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h index 3751aa9e..97c9be68 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h +++ b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h index 6affbd2a..05874893 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h +++ b/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile b/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile index 326a2f7d..9ec700c3 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile +++ b/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001 b/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001 index 2e3ab921..cdf3238e 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp index d39767b9..01abb973 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp +++ b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp index a7c33bb8..2876e228 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp +++ b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp index 72d224ab..cb058658 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp +++ b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp index 67a6f1e1..27b6badc 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp +++ b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp index c0cf4d6e..47f6caa8 100644 --- a/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp +++ b/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk b/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk index 29ad7a46..93b9f97a 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk +++ b/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp b/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp index 52b84742..39657831 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp +++ b/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp b/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp index 4b27745f..1211f915 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp +++ b/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h b/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h index e9e76c61..68efb44c 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h +++ b/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001 b/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001 index d81f2ed4..88693cd7 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001 +++ b/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h b/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h index 8a32269a..78f96a75 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h +++ b/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h b/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h index 91e35258..1ad792ed 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h +++ b/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp b/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp index 009f87f2..b48062ae 100644 --- a/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp +++ b/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,6 +58,11 @@ UI_32 NoOfElementsinData(std::string Input) { std::string ConvertArrayStringsToString(std::string *strArr, int Size) { int length = 0; std::string Result; + if (strArr == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "strArr is NULL"); + Result.append(""); + return Result; + } while (length < Size) { Result.append(strArr[length]); Result.append(","); @@ -71,6 +76,10 @@ std::string ConvertArrayStringsToString(std::string *strArr, int Size) { ///////////////////////////////////////////////////////////////////////////////// void ConvertStringToArrString(std::string Input, std::string *strArr, UI_32 &ArraySize) { // NOLINT (readability/nolint) + if (strArr == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "strArr is NULL"); + return; + } int i = 0; std::string first = ""; std::istringstream ss(Input); diff --git a/framework_unified/client/NativeServices/Makefile b/framework_unified/client/NativeServices/Makefile index 599974aa..c346b289 100644 --- a/framework_unified/client/NativeServices/Makefile +++ b/framework_unified/client/NativeServices/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk b/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk index 9b00e5eb..3baa0f25 100644 --- a/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk +++ b/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk b/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk index c0c624ef..68d15dad 100644 --- a/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk +++ b/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk b/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk index d630c998..528e7eab 100644 --- a/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk +++ b/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/analysis.mk b/framework_unified/client/NativeServices/cfg/analysis.mk index 63a386fe..c1e14fd5 100644 --- a/framework_unified/client/NativeServices/cfg/analysis.mk +++ b/framework_unified/client/NativeServices/cfg/analysis.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/common.mk b/framework_unified/client/NativeServices/cfg/common.mk index be238e85..10a9a6bb 100644 --- a/framework_unified/client/NativeServices/cfg/common.mk +++ b/framework_unified/client/NativeServices/cfg/common.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/config.mk b/framework_unified/client/NativeServices/cfg/config.mk index 08406c69..5eb23f4f 100644 --- a/framework_unified/client/NativeServices/cfg/config.mk +++ b/framework_unified/client/NativeServices/cfg/config.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/depends.mk b/framework_unified/client/NativeServices/cfg/depends.mk index 096f414d..57ecd9b2 100644 --- a/framework_unified/client/NativeServices/cfg/depends.mk +++ b/framework_unified/client/NativeServices/cfg/depends.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk b/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk index a7c60483..67205f11 100644 --- a/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk +++ b/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/makefile_PosixBasedOS001 b/framework_unified/client/NativeServices/makefile_PosixBasedOS001 index 9f418869..9b512f43 100644 --- a/framework_unified/client/NativeServices/makefile_PosixBasedOS001 +++ b/framework_unified/client/NativeServices/makefile_PosixBasedOS001 @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg b/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg index 3579d84b..0ca29e52 100644 --- a/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg +++ b/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg @@ -143,8 +143,8 @@ Realtimelog=True [FLAG_LIST] -#List=FLAG_UIAPP,FLAG_RADIO,FLAG_MEDIA,FLAG_VEHICLE,FLAG_NETWORK,FLAG_CONNECTIVITY,FLAG_APPFW,FLAG_BTTEL,FLAG_VR,FLAG_NAVI,FLAG_SYSTEM,FLAG_BASEPF,FLAG_COMMUNICATION,FLAG_LSP,FLAG__CWORD76_,FLAG_MISINK,FLAG_CONNPROXY -List=FLAG_UIAPP,FLAG_RADIO,FLAG_MEDIA,FLAG_VEHICLE,FLAG_NETWORK,FLAG_CONNECTIVITY,FLAG_APPFW,FLAG_BTTEL,FLAG_VR,FLAG_NAVI,FLAG_SYSTEM,FLAG_BASEPF,FLAG_COMMUNICATION,FLAG_LSP,FLAG__CWORD76_,FLAG_MISINK,FLAG_CONNPROXY,FLAG_CPAA +#List=FLAG_UIAPP,FLAG_RADIO,FLAG_MEDIA,FLAG_VEHICLE,FLAG_DIAG,FLAG_NETWORK,FLAG_CONNECTIVITY,FLAG_APPFW,FLAG_BTTEL,FLAG_VR,FLAG_NAVI,FLAG_SYSTEM,FLAG_BASEPF,FLAG_COMMUNICATION,FLAG_LSP,FLAG__CWORD76_,FLAG_MISINK,FLAG_CONNPROXY +List=FLAG_UIAPP,FLAG_RADIO,FLAG_MEDIA,FLAG_VEHICLE,FLAG_DIAG,FLAG_NETWORK,FLAG_CONNECTIVITY,FLAG_APPFW,FLAG_BTTEL,FLAG_VR,FLAG_NAVI,FLAG_SYSTEM,FLAG_BASEPF,FLAG_COMMUNICATION,FLAG_LSP,FLAG__CWORD76_,FLAG_MISINK,FLAG_CONNPROXY,FLAG_CPAA [FLAG_UIAPP] LogLevel=Release @@ -190,19 +190,24 @@ Service5=DtvVupService [FLAG_VEHICLE] LogLevel=Release FileName=frameworkunified_debug_vehicle.log -FileSizeMax=81920 +FileSizeMax=6553600 Realtimelog=True -Service1=DiagService -Service2=VS_ACNSrv -Service3=VS_CMRSrv -Service4=VS_DMSSrv -Service5=VS_ENMSrv -Service6=VS_FUCSrv -Service7=VS_METSrv -Service8=VS_NMSSrv -Service9=VS_VSDSrv -Service10=VS_TMCSrv +Service1=VS_ACNSrv +Service2=VS_CMRSrv +Service3=VS_DMSSrv +Service4=VS_ENMSrv +Service5=VS_FUCSrv +Service6=VS_METSrv +Service7=VS_NMSSrv +Service8=VS_VSDSrv +Service9=VS_TMCSrv +Service10=VS_DASSrv + +[FLAG_DIAG] +LogLevel=Release +FileName=frameworkunified_debug_diag.log +FileSizeMax=6553600 [FLAG_NETWORK] LogLevel=Release @@ -295,7 +300,7 @@ Service2=Positioning [FLAG_BASEPF] LogLevel=Release FileName=frameworkunified_debug_base_pf.log -FileSizeMax=716800 +FileSizeMax=5017600 Realtimelog=True Service1=AS_AudioManager diff --git a/framework_unified/client/include/native_service/XMLParser.h b/framework_unified/client/include/native_service/XMLParser.h index 57e9482c..36467ba4 100644 --- a/framework_unified/client/include/native_service/XMLParser.h +++ b/framework_unified/client/include/native_service/XMLParser.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/framework_unified.h b/framework_unified/client/include/native_service/framework_unified.h index fa06f177..b3c2f295 100644 --- a/framework_unified/client/include/native_service/framework_unified.h +++ b/framework_unified/client/include/native_service/framework_unified.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h b/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h index 307e542b..823257f6 100644 --- a/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h +++ b/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h b/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h index 27a6608e..2c189a70 100644 --- a/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h +++ b/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_application.h b/framework_unified/client/include/native_service/frameworkunified_application.h index b5678223..9d967515 100644 --- a/framework_unified/client/include/native_service/frameworkunified_application.h +++ b/framework_unified/client/include/native_service/frameworkunified_application.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_dispatcher.h b/framework_unified/client/include/native_service/frameworkunified_dispatcher.h index 6675653b..8aa45725 100644 --- a/framework_unified/client/include/native_service/frameworkunified_dispatcher.h +++ b/framework_unified/client/include/native_service/frameworkunified_dispatcher.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp b/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp index a12d4d94..8c8e3f5a 100644 --- a/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp +++ b/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_framework_if.h b/framework_unified/client/include/native_service/frameworkunified_framework_if.h index c90ce702..44ef8542 100644 --- a/framework_unified/client/include/native_service/frameworkunified_framework_if.h +++ b/framework_unified/client/include/native_service/frameworkunified_framework_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_framework_sync.h b/framework_unified/client/include/native_service/frameworkunified_framework_sync.h index 3aef25d3..3573e8cc 100644 --- a/framework_unified/client/include/native_service/frameworkunified_framework_sync.h +++ b/framework_unified/client/include/native_service/frameworkunified_framework_sync.h @@ -1,6 +1,6 @@ /* * - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h b/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h index 069bc67b..af7a4f9b 100644 --- a/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h +++ b/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_framework_types.h b/framework_unified/client/include/native_service/frameworkunified_framework_types.h index 5ca22979..aa4119df 100644 --- a/framework_unified/client/include/native_service/frameworkunified_framework_types.h +++ b/framework_unified/client/include/native_service/frameworkunified_framework_types.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_multithreading.h b/framework_unified/client/include/native_service/frameworkunified_multithreading.h index 133000a2..b9435969 100644 --- a/framework_unified/client/include/native_service/frameworkunified_multithreading.h +++ b/framework_unified/client/include/native_service/frameworkunified_multithreading.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_service_if.h b/framework_unified/client/include/native_service/frameworkunified_service_if.h index d78aadb2..b142d110 100644 --- a/framework_unified/client/include/native_service/frameworkunified_service_if.h +++ b/framework_unified/client/include/native_service/frameworkunified_service_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_service_protocol.h b/framework_unified/client/include/native_service/frameworkunified_service_protocol.h index 58772437..e66119e9 100644 --- a/framework_unified/client/include/native_service/frameworkunified_service_protocol.h +++ b/framework_unified/client/include/native_service/frameworkunified_service_protocol.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_action.h b/framework_unified/client/include/native_service/frameworkunified_sm_action.h index 6c6dfdea..58dbf225 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_action.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_action.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h b/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h index 198fb928..72ac6400 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h b/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h index 785eb0ed..110c1517 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h b/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h index 4d3fd287..fbb74eeb 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h b/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h index e271072b..2f392bab 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h b/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h index 4358a2df..e54d095e 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h b/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h index 0cd08bd9..02a2b3b7 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h b/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h index 9c2b4e56..a4668064 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h b/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h index 1daefd79..70afea16 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h b/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h index a7472513..8c90e595 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h b/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h index 88dcdeb8..fb00ecd3 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_guard.h b/framework_unified/client/include/native_service/frameworkunified_sm_guard.h index 6ea3d98c..1792f72f 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_guard.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_guard.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h b/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h index 5cbfda88..47d5914b 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h b/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h index 2b5fbcdd..1a8e1d74 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h b/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h index 32bc1cc6..fd61117f 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h b/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h index cc708fd2..71eebecf 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h b/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h index 2dce1106..e1aa6bda 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h b/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h index 7c5d0b6a..99975eb1 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h b/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h index 4ed1c2cc..827b180b 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h b/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h index a85fd0cf..c9ea8c7f 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h b/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h index c0d705da..83beea0a 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h b/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h index fdaacdab..945749db 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_state.h b/framework_unified/client/include/native_service/frameworkunified_sm_state.h index 9ea815c6..438e2e5a 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_state.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_state.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_sm_transition.h b/framework_unified/client/include/native_service/frameworkunified_sm_transition.h index bdb1d00d..232c91e7 100644 --- a/framework_unified/client/include/native_service/frameworkunified_sm_transition.h +++ b/framework_unified/client/include/native_service/frameworkunified_sm_transition.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_thread_priority.h b/framework_unified/client/include/native_service/frameworkunified_thread_priority.h index 88b3fdbe..2af26a31 100644 --- a/framework_unified/client/include/native_service/frameworkunified_thread_priority.h +++ b/framework_unified/client/include/native_service/frameworkunified_thread_priority.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_timer.h b/framework_unified/client/include/native_service/frameworkunified_timer.h index d7d3c26f..7a3c762e 100644 --- a/framework_unified/client/include/native_service/frameworkunified_timer.h +++ b/framework_unified/client/include/native_service/frameworkunified_timer.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/frameworkunified_types.h b/framework_unified/client/include/native_service/frameworkunified_types.h index 2f98ab66..faaf3aa0 100644 --- a/framework_unified/client/include/native_service/frameworkunified_types.h +++ b/framework_unified/client/include/native_service/frameworkunified_types.h @@ -1,6 +1,6 @@ /* * - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns__CWORD77__common.h b/framework_unified/client/include/native_service/ns__CWORD77__common.h index b83a0171..e472b303 100644 --- a/framework_unified/client/include/native_service/ns__CWORD77__common.h +++ b/framework_unified/client/include/native_service/ns__CWORD77__common.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h b/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h index 282fb006..0fab83bf 100644 --- a/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h +++ b/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h b/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h index 546bbb92..6e3fbc19 100644 --- a/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h +++ b/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h b/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h index 36053946..73f6a203 100644 --- a/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h +++ b/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns__CWORD77__notifications.h b/framework_unified/client/include/native_service/ns__CWORD77__notifications.h index fd82b52f..5d7e3999 100644 --- a/framework_unified/client/include/native_service/ns__CWORD77__notifications.h +++ b/framework_unified/client/include/native_service/ns__CWORD77__notifications.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns__CWORD77__types.h b/framework_unified/client/include/native_service/ns__CWORD77__types.h index ac79d991..ae6ce838 100644 --- a/framework_unified/client/include/native_service/ns__CWORD77__types.h +++ b/framework_unified/client/include/native_service/ns__CWORD77__types.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_buildversioncheck.hpp b/framework_unified/client/include/native_service/ns_buildversioncheck.hpp index 3dd671b4..d7f702c8 100644 --- a/framework_unified/client/include/native_service/ns_buildversioncheck.hpp +++ b/framework_unified/client/include/native_service/ns_buildversioncheck.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_config_parser_if.h b/framework_unified/client/include/native_service/ns_config_parser_if.h index d851b4c5..b40c01eb 100644 --- a/framework_unified/client/include/native_service/ns_config_parser_if.h +++ b/framework_unified/client/include/native_service/ns_config_parser_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_endianess.h b/framework_unified/client/include/native_service/ns_endianess.h index 6f752470..33fa8582 100644 --- a/framework_unified/client/include/native_service/ns_endianess.h +++ b/framework_unified/client/include/native_service/ns_endianess.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_eventlogger.h b/framework_unified/client/include/native_service/ns_eventlogger.h index 2b6884de..ab96e115 100644 --- a/framework_unified/client/include/native_service/ns_eventlogger.h +++ b/framework_unified/client/include/native_service/ns_eventlogger.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,6 +69,9 @@ typedef enum _NStoSS_LOGGERSERVICEPROTOCOL { SS_MSG_LOGGER_CNT_EVTLOG // NS to event logger thread } NStoSS_loggerserviceprotocol; +// Note: Don't remove #paragma pack(1) this is required for the +// ARM processor, forces data structures to be on a byte boundary +// all messages should be place in between #pragma pack(1) and #pragma pack() #pragma pack(1) typedef struct _stLogEvent_ { UI_32 ts; diff --git a/framework_unified/client/include/native_service/ns_logger_if.h b/framework_unified/client/include/native_service/ns_logger_if.h index dda61f26..a1ca9ef7 100644 --- a/framework_unified/client/include/native_service/ns_logger_if.h +++ b/framework_unified/client/include/native_service/ns_logger_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -115,7 +115,9 @@ typedef enum _NS_LOGGER_METHODS { LSLOGGER = 0x04, /// <Disabled LSHAREDMEM = 0x08 /// <Output to shared memory. this is the default logging method. } NS_LoggingMethod_t; - +// Note: Don't remove #paragma pack(1) this is required for the +// ARM processor, forces data structures to be on a byte boundary +// all messages should be place in between #pragma pack(1) and #pragma pack() #pragma pack(1) // *** DO NOT REMOVE *** typedef struct tag_Change_Log_Parameters { @@ -162,7 +164,7 @@ typedef struct _TNS_EnableRcsLogging { /// None /// \~english @par Conditions of processing failure /// - Real-time log output switch can be turn on by NsLogSetRealtimeLog() generally. -/// But in case of FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_FREEZE real-time log and/ramd/log/frameworkunifiedlog /will not print out +/// But in case of FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_FREEZE real-time log and/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog /will not print out /// \~~english @par /// - in the following conditions,real-time log will not print out: /// - log output way is LPRINT but f_uiZoneIndex parameter is in [96 to 127] @@ -185,7 +187,7 @@ typedef struct _TNS_EnableRcsLogging { /// - log output way is LPRINT,real-time log output setting is /// FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_USB_DISABLE /// \~english @par -/// in the following conditions /ramd/log/frameworkunifiedlog/ log can not be print out +/// in the following conditions /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/ log can not be print out /// - log file for parameter f_uiZoneIndex and /// log file for parameter FrameworkunifiedLogFlagId which is set by FRAMEWORKUNIFIEDLOG parameter can not be found /// - the ring_buffer of log file(log file for FrameworkunifiedLogFlagId which is set by FRAMEWORKUNIFIEDLOG parameter when @@ -233,7 +235,7 @@ __attribute__((format(printf, 4, 5))) /// None /// \~english @par Conditions of processing failure /// - Real-time log output switch can be turn on by NsLogSetRealtimeLog() generally. -/// But in case of FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_FREEZE real-time log and/ramd/log/frameworkunifiedlog /will not print out +/// But in case of FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_FREEZE real-time log and/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog /will not print out /// \~~english @par /// - in the following conditions,real-time log will not print out: /// - log output way is LPRINT but f_uiZoneIndex parameter is in [96 to 127] @@ -256,7 +258,7 @@ __attribute__((format(printf, 4, 5))) /// - log output way is LPRINT,real-time log output setting is /// FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_USB_DISABLE /// \~english @par -/// in the following conditions /ramd/log/frameworkunifiedlog/ log can not be print out +/// in the following conditions /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/ log can not be print out /// - log file for parameter f_uiZoneIndex and /// log file for parameter FrameworkunifiedLogFlagId which is set by FRAMEWORKUNIFIEDLOG parameter can not be found /// - the ring_buffer of log file(log file for FrameworkunifiedLogFlagId which is set by FRAMEWORKUNIFIEDLOG parameter when @@ -293,7 +295,7 @@ void NsLog0(const UI_16 p_lLine_i, // Line number where message was gener /// None /// \~english @par Conditions of processing failure /// - Real-time log output switch can be turn on by NsLogSetRealtimeLog() generally. -/// But in case of FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_FREEZE real-time log and/ramd/log/frameworkunifiedlog /will not print out +/// But in case of FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_FREEZE real-time log and/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog /will not print out /// \~~english @par /// - in the following conditions,real-time log will not print out: /// - log output way is LPRINT but f_uiZoneIndex parameter is in [96 to 127] @@ -316,7 +318,7 @@ void NsLog0(const UI_16 p_lLine_i, // Line number where message was gener /// - log output way is LPRINT,real-time log output setting is /// FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_USB_DISABLE /// \~english @par -/// in the following conditions /ramd/log/frameworkunifiedlog/ log can not be print out +/// in the following conditions /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/ log can not be print out /// - log file for parameter f_uiZoneIndex and /// log file for parameter FrameworkunifiedLogFlagId which is set by FRAMEWORKUNIFIEDLOG parameter can not be found /// - the ring_buffer of log file(log file for FrameworkunifiedLogFlagId which is set by FRAMEWORKUNIFIEDLOG parameter when @@ -364,7 +366,7 @@ void NsLogTime(const UI_16 f_uiZoneIndex, /// \~english @par Detail /// the difference bewteen NsLog and NsLogData: /// - NsLog()will print out real-time log -/// NsLogData() will not print out real-time log but noly print out logs under /ramd/log/frameworkunifiedlog/ +/// NsLogData() will not print out real-time log but noly print out logs under /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/ /// - NsLog() will add ZoneIndex, process name, real-time info to log but /// NsLogData() only print out log /// \~english @par Classification @@ -759,9 +761,9 @@ EFrameworkunifiedStatus NsLogGetFrameworkunifiedLogFlag(UI_8 flag_id, UI_8 *mode /// \~english @par Detail /// set the real-time log output using the setting value.\n /// need to reboot during ROM start in order to switch to Ethernet output\n -/// /nv_system/frameworkunifiedlog.ether file will be generated -/// when mode FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER /nv_system/frameworkunifiedlog.ether\n -/// and /nv_system/frameworkunifiedlog.ether file will be delated when mode is not FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER +/// /nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether file will be generated +/// when mode FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER /nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether\n +/// and /nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether file will be delated when mode is not FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER /// \~english @par Classification /// Public /// \~english @par Type diff --git a/framework_unified/client/include/native_service/ns_mc_system_info.h b/framework_unified/client/include/native_service/ns_mc_system_info.h index 546f422b..b61268aa 100644 --- a/framework_unified/client/include/native_service/ns_mc_system_info.h +++ b/framework_unified/client/include/native_service/ns_mc_system_info.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_message_center_if.h b/framework_unified/client/include/native_service/ns_message_center_if.h index d96685e3..cfd350f6 100644 --- a/framework_unified/client/include/native_service/ns_message_center_if.h +++ b/framework_unified/client/include/native_service/ns_message_center_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_msgs.h b/framework_unified/client/include/native_service/ns_msgs.h index 721cbb17..48c83e71 100644 --- a/framework_unified/client/include/native_service/ns_msgs.h +++ b/framework_unified/client/include/native_service/ns_msgs.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_np_service.h b/framework_unified/client/include/native_service/ns_np_service.h index e94c9339..e2a2deb7 100644 --- a/framework_unified/client/include/native_service/ns_np_service.h +++ b/framework_unified/client/include/native_service/ns_np_service.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_np_service_if.h b/framework_unified/client/include/native_service/ns_np_service_if.h index 337aafa0..b1889582 100644 --- a/framework_unified/client/include/native_service/ns_np_service_if.h +++ b/framework_unified/client/include/native_service/ns_np_service_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h b/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h index 21ea7c4a..88daef7b 100644 --- a/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h +++ b/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h b/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h index 3ec188f1..ea149c5a 100644 --- a/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h +++ b/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_np_service_notification.h b/framework_unified/client/include/native_service/ns_np_service_notification.h index 563d8c1b..5d389ec6 100644 --- a/framework_unified/client/include/native_service/ns_np_service_notification.h +++ b/framework_unified/client/include/native_service/ns_np_service_notification.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_np_service_protocol.h b/framework_unified/client/include/native_service/ns_np_service_protocol.h index 4332839e..475950bb 100644 --- a/framework_unified/client/include/native_service/ns_np_service_protocol.h +++ b/framework_unified/client/include/native_service/ns_np_service_protocol.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_np_types.h b/framework_unified/client/include/native_service/ns_np_types.h index e8835efd..01559d97 100644 --- a/framework_unified/client/include/native_service/ns_np_types.h +++ b/framework_unified/client/include/native_service/ns_np_types.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,10 +25,10 @@ #define FRAMEWORK_UNIFIED_CLIENT_NS_NPSERVICEIF_INCLUDE_NS_NP_TYPES_H_ // Path of immediate notification data in NS_NPS version 1 -#define IMMEDIATE_PERSISTENCE_STORAGE_V1 PF_NV_P3"/NPSNOR/" +#define IMMEDIATE_PERSISTENCE_STORAGE_V1 "/nv/BS/ns/npp/rwdata/NPSNOR/" // Path of immediate notification data in NS_NPS version 2 -#define IMMEDIATE_PERSISTENCE_STORAGE_V2 PF_SYS_NPP +#define IMMEDIATE_PERSISTENCE_STORAGE_V2 "/nv/BS/ns/npp/rwdata/" // name of persistence folder for persistent type categorization #define USERDATADIR "UserData/" // stores all the user data (all user common data as well as user specific data) diff --git a/framework_unified/client/include/native_service/ns_plogger_if.h b/framework_unified/client/include/native_service/ns_plogger_if.h index cc173539..f926f38e 100644 --- a/framework_unified/client/include/native_service/ns_plogger_if.h +++ b/framework_unified/client/include/native_service/ns_plogger_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp b/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp index b715571a..6f303f1c 100644 --- a/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp +++ b/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -459,6 +459,14 @@ class CPassThruInDataHandler { //////////////////////////////////////////////////////////////////////////////////////////////// EFrameworkunifiedStatus GetBuffer(UI_8 *&f_pui8Buffer, UI_16 &f_ui16BufLength) { EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; + if (f_pui8Buffer == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "f_pui8Buffer is NULL"); + return eFrameworkunifiedStatusNullPointer; + } + if (m_pui8CurOffset == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "m_pui8CurOffsetis NULL"); + return eFrameworkunifiedStatusNullPointer; + } if (m_ui16RemainingLength >= SIZE_OF_PASSTHRU_PARAM_BUFFERTYPE_HEADER) { if (0xB == *m_pui8CurOffset) { // check if the corresponding data is of type buffer m_pui8CurOffset++; @@ -513,6 +521,10 @@ class CPassThruInDataHandler { //////////////////////////////////////////////////////////////////////////////////////////////// EFrameworkunifiedStatus GetArrayCount(UI_16 &f_ui16NoOfArrayElements) { EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; + if (m_pui8CurOffset == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "m_pui8CurOffsetis NULL"); + return eFrameworkunifiedStatusNullPointer; + } if (m_ui16RemainingLength >= SIZE_OF_PASSTHRU_PARAM_BUFFERTYPE_HEADER) { if (0xC == *m_pui8CurOffset) { // check if the corresponding data is of type array m_pui8CurOffset++; @@ -537,6 +549,7 @@ class CPassThruInDataHandler { // template <class DataType> // EFrameworkunifiedStatus GetValue(DataType& f_dtOutValue); + /* * \return - * eFrameworkunifiedStatusFail - no sufficient data is available @@ -545,6 +558,10 @@ class CPassThruInDataHandler { */ template <class DataType> EFrameworkunifiedStatus GetValue(DataType &l_dtOutValue) { + if (m_pui8CurOffset == NULL) { + FRAMWEORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "m_pui8CurOffsetis NULL"); + return eFrameworkunifiedStatusNullPointer; + } EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; if (m_ui16RemainingLength >= (sizeof(DataType) + SIZE_OF_PASSTHRU_DATATYPE_IDENTIFIER)) { if ((0x1 <= *m_pui8CurOffset) && (*m_pui8CurOffset <= 0x9)) // Get value is applicable only for basic types, @@ -1000,6 +1017,10 @@ class CPassThruOutDataHandler { EFrameworkunifiedStatus SetBuffer(UI_8 *f_pui8Buffer, UI_16 f_ui16BufLength) { EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; // TODO: add error check for resize operation + if (f_pui8Buffer == NULL) { + FRAMEWORKUNIFIEDLOG(ZONE_NS_ERR, __func__, "f_pui8Buffer is NULL"); + return eFrameworkunifiedStatusNullPointer; + } m_ui16TotalLength = static_cast<UI_16>(m_ui16TotalLength + f_ui16BufLength + SIZE_OF_PASSTHRU_PARAM_BUFFERTYPE_HEADER); m_vui8Data.resize(m_ui16TotalLength); *static_cast<UI_8 *>(static_cast<PVOID>(&m_vui8Data[m_ui16CurOffset])) = 0xB; diff --git a/framework_unified/client/include/native_service/ns_rcs_logger_types.h b/framework_unified/client/include/native_service/ns_rcs_logger_types.h index 3fa3932b..cc28f7c1 100644 --- a/framework_unified/client/include/native_service/ns_rcs_logger_types.h +++ b/framework_unified/client/include/native_service/ns_rcs_logger_types.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_rcs_plugin.hpp b/framework_unified/client/include/native_service/ns_rcs_plugin.hpp index 57f20f91..617aa1d6 100644 --- a/framework_unified/client/include/native_service/ns_rcs_plugin.hpp +++ b/framework_unified/client/include/native_service/ns_rcs_plugin.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_reader.h b/framework_unified/client/include/native_service/ns_reader.h index f3a2b53e..f306a52d 100644 --- a/framework_unified/client/include/native_service/ns_reader.h +++ b/framework_unified/client/include/native_service/ns_reader.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_resource_controler.h b/framework_unified/client/include/native_service/ns_resource_controler.h index b6d609cf..0cce23af 100644 --- a/framework_unified/client/include/native_service/ns_resource_controler.h +++ b/framework_unified/client/include/native_service/ns_resource_controler.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_ringbuffer.h b/framework_unified/client/include/native_service/ns_ringbuffer.h index aacdbda6..b67cd17e 100644 --- a/framework_unified/client/include/native_service/ns_ringbuffer.h +++ b/framework_unified/client/include/native_service/ns_ringbuffer.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_shared_mem.h b/framework_unified/client/include/native_service/ns_shared_mem.h index 0f16821d..981c1ad7 100644 --- a/framework_unified/client/include/native_service/ns_shared_mem.h +++ b/framework_unified/client/include/native_service/ns_shared_mem.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_shared_mem_if.h b/framework_unified/client/include/native_service/ns_shared_mem_if.h index df36bab8..25c5da19 100644 --- a/framework_unified/client/include/native_service/ns_shared_mem_if.h +++ b/framework_unified/client/include/native_service/ns_shared_mem_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_sharedmem.h b/framework_unified/client/include/native_service/ns_sharedmem.h index 33e32050..d8ac8b93 100644 --- a/framework_unified/client/include/native_service/ns_sharedmem.h +++ b/framework_unified/client/include/native_service/ns_sharedmem.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_sharedmem_reader.h b/framework_unified/client/include/native_service/ns_sharedmem_reader.h index 10f0a7c3..9a34909e 100644 --- a/framework_unified/client/include/native_service/ns_sharedmem_reader.h +++ b/framework_unified/client/include/native_service/ns_sharedmem_reader.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_sharedmem_writer.h b/framework_unified/client/include/native_service/ns_sharedmem_writer.h index e155698c..de6e9f94 100644 --- a/framework_unified/client/include/native_service/ns_sharedmem_writer.h +++ b/framework_unified/client/include/native_service/ns_sharedmem_writer.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_system_mode.h b/framework_unified/client/include/native_service/ns_system_mode.h index 3ffc7d74..9815904c 100644 --- a/framework_unified/client/include/native_service/ns_system_mode.h +++ b/framework_unified/client/include/native_service/ns_system_mode.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_timer_if.h b/framework_unified/client/include/native_service/ns_timer_if.h index 248df94d..549fc4c3 100644 --- a/framework_unified/client/include/native_service/ns_timer_if.h +++ b/framework_unified/client/include/native_service/ns_timer_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_timer_if.hpp b/framework_unified/client/include/native_service/ns_timer_if.hpp index 89ac90bf..ffcd8c8a 100644 --- a/framework_unified/client/include/native_service/ns_timer_if.hpp +++ b/framework_unified/client/include/native_service/ns_timer_if.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_transmit_log.h b/framework_unified/client/include/native_service/ns_transmit_log.h index 621647d8..e61ec7ef 100644 --- a/framework_unified/client/include/native_service/ns_transmit_log.h +++ b/framework_unified/client/include/native_service/ns_transmit_log.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_util_crc.h b/framework_unified/client/include/native_service/ns_util_crc.h index 39dff1d1..55280071 100644 --- a/framework_unified/client/include/native_service/ns_util_crc.h +++ b/framework_unified/client/include/native_service/ns_util_crc.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_util_directory.h b/framework_unified/client/include/native_service/ns_util_directory.h index 4f92f624..945275c0 100644 --- a/framework_unified/client/include/native_service/ns_util_directory.h +++ b/framework_unified/client/include/native_service/ns_util_directory.h @@ -4,7 +4,7 @@ * */ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_utility.hpp b/framework_unified/client/include/native_service/ns_utility.hpp index 74c481cd..07fe4f55 100644 --- a/framework_unified/client/include/native_service/ns_utility.hpp +++ b/framework_unified/client/include/native_service/ns_utility.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_utility_if.h b/framework_unified/client/include/native_service/ns_utility_if.h index 86b3d7a8..ee103376 100644 --- a/framework_unified/client/include/native_service/ns_utility_if.h +++ b/framework_unified/client/include/native_service/ns_utility_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_utility_sys.hpp b/framework_unified/client/include/native_service/ns_utility_sys.hpp index fbd7a470..5780144d 100644 --- a/framework_unified/client/include/native_service/ns_utility_sys.hpp +++ b/framework_unified/client/include/native_service/ns_utility_sys.hpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_version.h b/framework_unified/client/include/native_service/ns_version.h index 7709d626..fad7efff 100644 --- a/framework_unified/client/include/native_service/ns_version.h +++ b/framework_unified/client/include/native_service/ns_version.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_version_if.h b/framework_unified/client/include/native_service/ns_version_if.h index 2f2b0e2d..d0f5172e 100644 --- a/framework_unified/client/include/native_service/ns_version_if.h +++ b/framework_unified/client/include/native_service/ns_version_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_writer.h b/framework_unified/client/include/native_service/ns_writer.h index 45d465c5..788b6a4f 100644 --- a/framework_unified/client/include/native_service/ns_writer.h +++ b/framework_unified/client/include/native_service/ns_writer.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_xml_reader.h b/framework_unified/client/include/native_service/ns_xml_reader.h index f0b54d05..91e88c03 100644 --- a/framework_unified/client/include/native_service/ns_xml_reader.h +++ b/framework_unified/client/include/native_service/ns_xml_reader.h @@ -16,7 +16,7 @@ */ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_xml_writer.h b/framework_unified/client/include/native_service/ns_xml_writer.h index be221213..7686553e 100644 --- a/framework_unified/client/include/native_service/ns_xml_writer.h +++ b/framework_unified/client/include/native_service/ns_xml_writer.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/ns_xmlparser_if.h b/framework_unified/client/include/native_service/ns_xmlparser_if.h index e55aa801..f944dddb 100644 --- a/framework_unified/client/include/native_service/ns_xmlparser_if.h +++ b/framework_unified/client/include/native_service/ns_xmlparser_if.h @@ -17,7 +17,7 @@ * @{ */ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/nsfw_message.h b/framework_unified/client/include/native_service/nsfw_message.h index 101a288f..b5872c57 100644 --- a/framework_unified/client/include/native_service/nsfw_message.h +++ b/framework_unified/client/include/native_service/nsfw_message.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/nslogutil_cmd_if.h b/framework_unified/client/include/native_service/nslogutil_cmd_if.h index 0b6be43b..90f03b79 100644 --- a/framework_unified/client/include/native_service/nslogutil_cmd_if.h +++ b/framework_unified/client/include/native_service/nslogutil_cmd_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/native_service/wpf_legacy.h b/framework_unified/client/include/native_service/wpf_legacy.h index 7367a7e3..7553f911 100644 --- a/framework_unified/client/include/native_service/wpf_legacy.h +++ b/framework_unified/client/include/native_service/wpf_legacy.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/ns__CWORD77__template.h b/framework_unified/client/include/ns__CWORD77__template.h index a2d9c6af..e4069dd9 100644 --- a/framework_unified/client/include/ns__CWORD77__template.h +++ b/framework_unified/client/include/ns__CWORD77__template.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/ns_logger_additional_if.h b/framework_unified/client/include/ns_logger_additional_if.h index 9d257dd1..4d67e189 100644 --- a/framework_unified/client/include/ns_logger_additional_if.h +++ b/framework_unified/client/include/ns_logger_additional_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/include/nsverutil_cmd_if.h b/framework_unified/client/include/nsverutil_cmd_if.h index ecf3d51c..70705e84 100644 --- a/framework_unified/client/include/nsverutil_cmd_if.h +++ b/framework_unified/client/include/nsverutil_cmd_if.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/framework_unified/client/libNS_FrameworkUnified.ver b/framework_unified/client/libNS_FrameworkUnified.ver index bae78cf8..764c5bbd 100644 --- a/framework_unified/client/libNS_FrameworkUnified.ver +++ b/framework_unified/client/libNS_FrameworkUnified.ver @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/native_service.mk b/native_service.mk index 5cf73b78..729362ca 100644 --- a/native_service.mk +++ b/native_service.mk @@ -1,7 +1,7 @@ ############################################################# # # Common Makefile for native_service -# Copyright (C) 2017-2019 TOYOTA MOTOR CORPORATION +# Copyright (C) 2017-2020 TOYOTA MOTOR CORPORATION # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |