---
src/ckpt/apitest/test_cpsv.h | 2 +-
src/ckpt/ckptnd/cpnd_res.c | 18 +++++++++---------
src/ckpt/common/cpsv_evt.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/ckpt/apitest/test_cpsv.h b/src/ckpt/apitest/test_cpsv.h
index 27d7c8076..97c78f256 100644
--- a/src/ckpt/apitest/test_cpsv.h
+++ b/src/ckpt/apitest/test_cpsv.h
@@ -684,7 +684,7 @@ typedef struct test_cpsv_inst {
int test_list;
int test_case_num;
int num_of_iter;
- int node_id;
+ unsigned node_id;
int redFlag;
SaNameT all_rep_ckpt_name;
SaNameT active_rep_ckpt_name;
diff --git a/src/ckpt/ckptnd/cpnd_res.c b/src/ckpt/ckptnd/cpnd_res.c
index a20014990..3d69f3f3f 100644
--- a/src/ckpt/ckptnd/cpnd_res.c
+++ b/src/ckpt/ckptnd/cpnd_res.c
@@ -23,6 +23,9 @@
******************************************************************************/
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
#include "ckpt/ckptnd/cpnd.h"
#define m_CPND_CKPT_HDR_UPDATE(ckpt_hdr, addr, offset)
\
@@ -372,7 +375,7 @@ void *cpnd_restart_shm_create(NCS_OS_POSIX_SHM_REQ_INFO
*cpnd_open_req,
CKPT_INFO cp_info, tmp_cp_info;
SaCkptHandleT client_hdl;
char *buf = NULL, *buffer = NULL;
- uint8_t size = 0, total_length;
+ size_t total_length = strlen("CPND_CHECKPOINT_INFO") + 12;
GBL_SHM_PTR gbl_shm_addr = {0, 0, 0, 0, 0};
memset(&cp_info, '\0', sizeof(CKPT_INFO));
NCS_OS_POSIX_SHM_REQ_INFO ckpt_rep_open;
@@ -387,8 +390,6 @@ void *cpnd_restart_shm_create(NCS_OS_POSIX_SHM_REQ_INFO
*cpnd_open_req,
memset(&cpnd_shm_version, '\0', sizeof(cpnd_shm_version));
cpnd_shm_version.shm_version = CPSV_CPND_SHM_VERSION;
- size = strlen("CPND_CHECKPOINT_INFO");
- total_length = size + sizeof(nodeid) + 5;
buffer = m_MMGR_ALLOC_CPND_DEFAULT(total_length);
if (buffer == NULL) {
LOG_ER(
@@ -397,8 +398,8 @@ void *cpnd_restart_shm_create(NCS_OS_POSIX_SHM_REQ_INFO
*cpnd_open_req,
}
cb->cpnd_res_shm_name = (uint8_t *)buffer;
memset(buffer, '\0', total_length);
- strncpy(buffer, "CPND_CHECKPOINT_INFO", total_length);
- sprintf(buffer + size, "_%d", (uint32_t)nodeid);
+ snprintf(buffer, total_length, "CPND_CHECKPOINT_INFO_%" PRIu32,
+ (uint32_t)nodeid);
/* 1. FIRST TRYING TO OPEN IN RDWR MODE */
cpnd_open_req->type = NCS_OS_POSIX_SHM_REQ_OPEN;
@@ -1851,8 +1852,7 @@ static uint32_t cpnd_shm_extended_open(CPND_CB *cb,
uint32_t flag)
uint32_t rc = NCSCC_RC_FAILURE;
NCS_OS_POSIX_SHM_REQ_INFO cpnd_open_req;
memset(&cpnd_open_req, 0, sizeof(cpnd_open_req));
- uint8_t total_length =
- strlen("CPND_EXTENDED_INFO") + sizeof(cb->nodeid) + 5;
+ uint8_t total_length = strlen("CPND_EXTENDED_INFO") + 12;
char *buffer = m_MMGR_ALLOC_CPND_DEFAULT(total_length);
if (buffer == NULL) {
LOG_ER(
@@ -1861,8 +1861,8 @@ static uint32_t cpnd_shm_extended_open(CPND_CB *cb,
uint32_t flag)
}
cb->cpnd_res_shm_name = (uint8_t *)buffer;
memset(buffer, '\0', total_length);
- strncpy(buffer, "CPND_EXTENDED_INFO", total_length);
- sprintf(buffer + strlen("CPND_EXTENDED_INFO"), "_%d", cb->nodeid);
+ snprintf(buffer, total_length, "CPND_EXTENDED_INFO_%" PRIu32,
+ cb->nodeid);
cpnd_open_req.type = NCS_OS_POSIX_SHM_REQ_OPEN;
cpnd_open_req.info.open.i_size = MAX_CKPTS * sizeof(CKPT_EXTENDED_INFO);
diff --git a/src/ckpt/common/cpsv_evt.c b/src/ckpt/common/cpsv_evt.c
index 63a8520f4..d89793194 100644
--- a/src/ckpt/common/cpsv_evt.c
+++ b/src/ckpt/common/cpsv_evt.c
@@ -2801,7 +2801,7 @@ void cpsv_evt_trace(char *svc_name, CPSV_EVT_REQUEST
request, CPSV_EVT *evt,
MDS_DEST mds_dest)
{
char evt_str[MAX_EVT_STR_LEN] = {0};
- int node_id = m_NCS_NODE_ID_FROM_MDS_DEST(mds_dest);
+ unsigned node_id = m_NCS_NODE_ID_FROM_MDS_DEST(mds_dest);
cpsv_evt_str(evt, evt_str, MAX_EVT_STR_LEN);
--
2.13.3
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
