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 /framework_unified/client/NS_MessageQueue | |
parent | 743e39eb1c5ab4fb1d6ab94aeb673e8ac463c243 (diff) |
ns-frameworkunified branch 0.1sandbox/ToshikazuOhiwa/ns-frameworkunified
Diffstat (limited to 'framework_unified/client/NS_MessageQueue')
7 files changed, 25 insertions, 8 deletions
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; //////////////////////////////////////////////////////////////////////////////////////////////////// |