osaf/libs/agents/infrastructure/rda/Makefile.am | 2 +- osaf/libs/agents/infrastructure/rda/rda.h | 15 +- osaf/libs/agents/infrastructure/rda/rda_papi.c | 76 +++++++------- osaf/libs/core/include/rda_papi.h | 2 +- osaf/services/infrastructure/rde/Makefile.am | 8 +- osaf/services/infrastructure/rde/include/rde_amf.h | 7 +- osaf/services/infrastructure/rde/include/rde_cb.h | 10 +- osaf/services/infrastructure/rde/include/rde_rda.h | 14 +- osaf/services/infrastructure/rde/include/rde_rda_common.h | 4 +- osaf/services/infrastructure/rde/rde_amf.c | 6 +- osaf/services/infrastructure/rde/rde_main.c | 22 ++-- osaf/services/infrastructure/rde/rde_mds.c | 8 +- osaf/services/infrastructure/rde/rde_rda.c | 10 +- 13 files changed, 94 insertions(+), 90 deletions(-)
diff --git a/osaf/libs/agents/infrastructure/rda/Makefile.am b/osaf/libs/agents/infrastructure/rda/Makefile.am --- a/osaf/libs/agents/infrastructure/rda/Makefile.am +++ b/osaf/libs/agents/infrastructure/rda/Makefile.am @@ -28,7 +28,7 @@ librda_la_CPPFLAGS = \ -I$(top_srcdir)/osaf/services/infrastructure/rde/include librda_la_SOURCES = \ - rda_papi.c + rda_papi.cc librda_la_LDFLAGS = -version-info @OPENSAF_LIB_VERSION@ diff --git a/osaf/libs/agents/infrastructure/rda/rda.h b/osaf/libs/agents/infrastructure/rda/rda.h --- a/osaf/libs/agents/infrastructure/rda/rda.h +++ b/osaf/libs/agents/infrastructure/rda/rda.h @@ -33,9 +33,10 @@ /* ** includes */ -#include <stdio.h> +#include <cstdio> #include <sys/types.h> -#include <string.h> +#include <cstring> +#include <stdint.h> #include <unistd.h> #include <sys/un.h> #include <sys/socket.h> @@ -69,18 +70,18 @@ /* ** Structure declarations */ -typedef struct { +struct RDA_CALLBACK_CB { NCSCONTEXT task_handle; bool task_terminate; PCS_RDA_CB_PTR callback_ptr; uint32_t callback_handle; int sockfd; -} RDA_CALLBACK_CB; +}; -typedef struct { - struct sockaddr_un sock_address; +struct RDA_CONTROL_BLOCK { + sockaddr_un sock_address; -} RDA_CONTROL_BLOCK; +}; #endif /* RDA_H */ diff --git a/osaf/libs/agents/infrastructure/rda/rda_papi.c b/osaf/libs/agents/infrastructure/rda/rda_papi.cc rename from osaf/libs/agents/infrastructure/rda/rda_papi.c rename to osaf/libs/agents/infrastructure/rda/rda_papi.cc --- a/osaf/libs/agents/infrastructure/rda/rda_papi.c +++ b/osaf/libs/agents/infrastructure/rda/rda_papi.cc @@ -33,7 +33,8 @@ ** Includes */ #include "rda.h" -#include <errno.h> +#include <cerrno> +#include <cstdlib> #include <sched.h> #include "logtrace.h" #include "osaf_poll.h" @@ -47,12 +48,15 @@ static void *pcs_rda_callback_cb = NULL; /* ** Static functions */ -static uint32_t rda_read_msg(int sockfd, char *msg, int size); -static uint32_t rda_write_msg(int sockfd, char *msg); -static uint32_t rda_parse_msg(const char *pmsg, RDE_RDA_CMD_TYPE *cmd_type, int *value); -static uint32_t rda_connect(int *sockfd); -static uint32_t rda_disconnect(int sockfd); -static uint32_t rda_callback_req(int sockfd); +static PCSRDA_RETURN_CODE rda_callback_task(RDA_CALLBACK_CB *rda_callback_cb); +static PCSRDA_RETURN_CODE pcs_rda_reg_callback(uint32_t cb_handle, PCS_RDA_CB_PTR rda_cb_ptr, void **task_cb); +static PCSRDA_RETURN_CODE pcs_rda_unreg_callback(void *task_cb); +static PCSRDA_RETURN_CODE rda_read_msg(int sockfd, char *msg, int size); +static PCSRDA_RETURN_CODE rda_write_msg(int sockfd, char *msg); +static PCSRDA_RETURN_CODE rda_parse_msg(const char *pmsg, RDE_RDA_CMD_TYPE *cmd_type, int *value); +static PCSRDA_RETURN_CODE rda_connect(int *sockfd); +static PCSRDA_RETURN_CODE rda_disconnect(int sockfd); +static PCSRDA_RETURN_CODE rda_callback_req(int sockfd); /***************************************************************************** @@ -70,14 +74,14 @@ static uint32_t rda_callback_req(int soc NOTES: *****************************************************************************/ -static uint32_t rda_callback_task(RDA_CALLBACK_CB *rda_callback_cb) +static PCSRDA_RETURN_CODE rda_callback_task(RDA_CALLBACK_CB *rda_callback_cb) { char msg[64] = { 0 }; - uint32_t rc = PCSRDA_RC_SUCCESS; + PCSRDA_RETURN_CODE rc = PCSRDA_RC_SUCCESS; int value = -1; int retry_count = 0; bool conn_lost = false; - RDE_RDA_CMD_TYPE cmd_type = 0; + RDE_RDA_CMD_TYPE cmd_type = RDE_RDA_UNKNOWN; PCS_RDA_CB_INFO cb_info; while (!rda_callback_cb->task_terminate) { @@ -153,7 +157,7 @@ static uint32_t rda_callback_task(RDA_CA ** Invoke callback */ cb_info.cb_type = PCS_RDA_ROLE_CHG_IND; - cb_info.info.io_role = value; + cb_info.info.io_role = static_cast<PCS_RDA_ROLE>(value); (*rda_callback_cb->callback_ptr) (rda_callback_cb->callback_handle, &cb_info, PCSRDA_RC_SUCCESS); } @@ -173,9 +177,9 @@ static uint32_t rda_callback_task(RDA_CA * * Notes : None *****************************************************************************/ -static int pcs_rda_reg_callback(uint32_t cb_handle, PCS_RDA_CB_PTR rda_cb_ptr, void **task_cb) +static PCSRDA_RETURN_CODE pcs_rda_reg_callback(uint32_t cb_handle, PCS_RDA_CB_PTR rda_cb_ptr, void **task_cb) { - uint32_t rc = PCSRDA_RC_SUCCESS; + PCSRDA_RETURN_CODE rc = PCSRDA_RC_SUCCESS; int sockfd = -1; bool is_task_spawned = false; RDA_CALLBACK_CB *rda_callback_cb = NULL; @@ -214,7 +218,7 @@ static int pcs_rda_reg_callback(uint32_t /* ** Allocate callback control block */ - rda_callback_cb = m_NCS_MEM_ALLOC(sizeof(RDA_CALLBACK_CB), 0, 0, 0); + rda_callback_cb = static_cast<RDA_CALLBACK_CB*>(malloc(sizeof(RDA_CALLBACK_CB))); if (rda_callback_cb == NULL) { rc = PCSRDA_RC_MEM_ALLOC_FAILED; break; @@ -282,9 +286,9 @@ static int pcs_rda_reg_callback(uint32_t * * Notes : None *****************************************************************************/ -static int pcs_rda_unreg_callback(void *task_cb) +static PCSRDA_RETURN_CODE pcs_rda_unreg_callback(void *task_cb) { - uint32_t rc = PCSRDA_RC_SUCCESS; + PCSRDA_RETURN_CODE rc = PCSRDA_RC_SUCCESS; RDA_CALLBACK_CB *rda_callback_cb = NULL; if (!task_cb) @@ -336,13 +340,13 @@ static int pcs_rda_unreg_callback(void * * * Notes : None *****************************************************************************/ -static int pcs_rda_set_role(PCS_RDA_ROLE role) +static PCSRDA_RETURN_CODE pcs_rda_set_role(PCS_RDA_ROLE role) { - uint32_t rc = PCSRDA_RC_SUCCESS; + PCSRDA_RETURN_CODE rc = PCSRDA_RC_SUCCESS; int sockfd; char msg[64] = { 0 }; int value = -1; - RDE_RDA_CMD_TYPE cmd_type = 0; + RDE_RDA_CMD_TYPE cmd_type = RDE_RDA_UNKNOWN; /* ** Connect @@ -401,13 +405,13 @@ static int pcs_rda_set_role(PCS_RDA_ROLE * * Notes : None *****************************************************************************/ -static int pcs_rda_get_role(PCS_RDA_ROLE *role) +static PCSRDA_RETURN_CODE pcs_rda_get_role(PCS_RDA_ROLE *role) { - uint32_t rc = PCSRDA_RC_SUCCESS; + PCSRDA_RETURN_CODE rc = PCSRDA_RC_SUCCESS; int sockfd; char msg[64] = { 0 }; int value = -1; - RDE_RDA_CMD_TYPE cmd_type = 0; + RDE_RDA_CMD_TYPE cmd_type = RDE_RDA_UNKNOWN; *role = PCS_RDA_UNDEFINED; @@ -446,7 +450,7 @@ static int pcs_rda_get_role(PCS_RDA_ROLE /* ** We have a role */ - *role = value; + *role = static_cast<PCS_RDA_ROLE>(value); } while (0); @@ -468,7 +472,7 @@ static int pcs_rda_get_role(PCS_RDA_ROLE NOTES: *****************************************************************************/ -static RDA_CONTROL_BLOCK *rda_get_control_block(void) +static RDA_CONTROL_BLOCK *rda_get_control_block() { static bool initialized = false; static RDA_CONTROL_BLOCK rda_cb; @@ -504,7 +508,7 @@ static RDA_CONTROL_BLOCK *rda_get_contro NOTES: *****************************************************************************/ -static uint32_t rda_connect(int *sockfd) +static PCSRDA_RETURN_CODE rda_connect(int *sockfd) { RDA_CONTROL_BLOCK *rda_cb = rda_get_control_block(); /* @@ -542,7 +546,7 @@ static uint32_t rda_connect(int *sockfd) NOTES: *****************************************************************************/ -static uint32_t rda_disconnect(int sockfd) +static PCSRDA_RETURN_CODE rda_disconnect(int sockfd) { char msg[64] = { 0 }; @@ -578,12 +582,12 @@ static uint32_t rda_disconnect(int sockf NOTES: *****************************************************************************/ -static uint32_t rda_callback_req(int sockfd) +static PCSRDA_RETURN_CODE rda_callback_req(int sockfd) { char msg[64] = { 0 }; - uint32_t rc = PCSRDA_RC_SUCCESS; + PCSRDA_RETURN_CODE rc = PCSRDA_RC_SUCCESS; int value = -1; - RDE_RDA_CMD_TYPE cmd_type = 0; + RDE_RDA_CMD_TYPE cmd_type = RDE_RDA_UNKNOWN; /* ** Send callback reg request messgae @@ -625,7 +629,7 @@ static uint32_t rda_callback_req(int soc NOTES: *****************************************************************************/ -static uint32_t rda_write_msg(int sockfd, char *msg) +static PCSRDA_RETURN_CODE rda_write_msg(int sockfd, char *msg) { int msg_size = 0; @@ -656,7 +660,7 @@ static uint32_t rda_write_msg(int sockfd NOTES: *****************************************************************************/ -static uint32_t rda_read_msg(int sockfd, char *msg, int size) +static PCSRDA_RETURN_CODE rda_read_msg(int sockfd, char *msg, int size) { int rc; int msg_size = 0; @@ -715,7 +719,7 @@ static uint32_t rda_read_msg(int sockfd, NOTES: *****************************************************************************/ -static uint32_t rda_parse_msg(const char *pmsg, RDE_RDA_CMD_TYPE *cmd_type, int *value) +static PCSRDA_RETURN_CODE rda_parse_msg(const char *pmsg, RDE_RDA_CMD_TYPE *cmd_type, int *value) { char msg[64] = { 0 }; char *ptr; @@ -729,11 +733,11 @@ static uint32_t rda_parse_msg(const char */ ptr = strchr(msg, ' '); if (ptr == NULL) { - *cmd_type = atoi(msg); + *cmd_type = static_cast<RDE_RDA_CMD_TYPE>(atoi(msg)); } else { *ptr = '\0'; - *cmd_type = atoi(msg); + *cmd_type = static_cast<RDE_RDA_CMD_TYPE>(atoi(msg)); *value = atoi(++ptr); } @@ -793,9 +797,9 @@ uint32_t rda_register_callback(uint32_t * * Notes : None *****************************************************************************/ -int pcs_rda_request(PCS_RDA_REQ *pcs_rda_req) +PCSRDA_RETURN_CODE pcs_rda_request(PCS_RDA_REQ *pcs_rda_req) { - int ret = PCSRDA_RC_SUCCESS; + PCSRDA_RETURN_CODE ret = PCSRDA_RC_SUCCESS; switch (pcs_rda_req->req_type) { diff --git a/osaf/libs/core/include/rda_papi.h b/osaf/libs/core/include/rda_papi.h --- a/osaf/libs/core/include/rda_papi.h +++ b/osaf/libs/core/include/rda_papi.h @@ -116,7 +116,7 @@ typedef struct { /* ** API Declaration */ -int pcs_rda_request(PCS_RDA_REQ *pcs_rda_req); +PCSRDA_RETURN_CODE pcs_rda_request(PCS_RDA_REQ *pcs_rda_req); /** * Get AMF style HA role from RDE diff --git a/osaf/services/infrastructure/rde/Makefile.am b/osaf/services/infrastructure/rde/Makefile.am --- a/osaf/services/infrastructure/rde/Makefile.am +++ b/osaf/services/infrastructure/rde/Makefile.am @@ -28,10 +28,10 @@ osafrded_CPPFLAGS = \ -I$(top_srcdir)/osaf/services/infrastructure/rde/include osafrded_SOURCES = \ - rde_amf.c \ - rde_main.c \ - rde_mds.c \ - rde_rda.c + rde_amf.cc \ + rde_main.cc \ + rde_mds.cc \ + rde_rda.cc osafrded_LDADD = \ $(top_builddir)/osaf/libs/core/libopensaf_core.la \ diff --git a/osaf/services/infrastructure/rde/include/rde_amf.h b/osaf/services/infrastructure/rde/include/rde_amf.h --- a/osaf/services/infrastructure/rde/include/rde_amf.h +++ b/osaf/services/infrastructure/rde/include/rde_amf.h @@ -36,10 +36,9 @@ * Includes */ -#include <stdbool.h> #include <sys/types.h> #include <sys/stat.h> -#include <stdarg.h> +#include <cstdarg> #include "ncs_main_papi.h" #include "saAis.h" @@ -53,14 +52,14 @@ /* * RDE AMF control information */ -typedef struct { +struct RDE_AMF_CB { char comp_name[256]; SaAmfHandleT amf_hdl; /* AMF handle */ SaSelectionObjectT amf_fd; /* AMF selection fd */ bool is_amf_up; /* For amf_fd and pipe_fd */ bool nid_started; /**< true if started by NID */ -} RDE_AMF_CB; +}; extern uint32_t rde_amf_init(RDE_AMF_CB *rde_amf_cb); diff --git a/osaf/services/infrastructure/rde/include/rde_cb.h b/osaf/services/infrastructure/rde/include/rde_cb.h --- a/osaf/services/infrastructure/rde/include/rde_cb.h +++ b/osaf/services/infrastructure/rde/include/rde_cb.h @@ -33,7 +33,7 @@ ** */ -typedef struct { +struct RDE_CONTROL_BLOCK { SYSF_MBX mbx; const char *prog_name; NCSCONTEXT task_handle; @@ -46,14 +46,14 @@ typedef struct { RDE_RDA_CB rde_rda_cb; RDE_AMF_CB rde_amf_cb; -} RDE_CONTROL_BLOCK; +}; -typedef enum rde_msg_type { +enum RDE_MSG_TYPE { RDE_MSG_PEER_UP = 1, RDE_MSG_PEER_DOWN = 2, RDE_MSG_PEER_INFO_REQ = 3, RDE_MSG_PEER_INFO_RESP = 4, -} RDE_MSG_TYPE; +}; struct rde_peer_info { PCS_RDA_ROLE ha_role; @@ -78,7 +78,7 @@ extern NCS_NODE_ID rde_my_node_id; * * \*****************************************************************************/ -extern RDE_CONTROL_BLOCK *rde_get_control_block(void); +extern RDE_CONTROL_BLOCK *rde_get_control_block(); extern uint32_t rde_mds_register(RDE_CONTROL_BLOCK *cb); extern uint32_t rde_mds_send(struct rde_msg *msg, MDS_DEST to_dest); extern uint32_t rde_set_role(PCS_RDA_ROLE role); diff --git a/osaf/services/infrastructure/rde/include/rde_rda.h b/osaf/services/infrastructure/rde/include/rde_rda.h --- a/osaf/services/infrastructure/rde/include/rde_rda.h +++ b/osaf/services/infrastructure/rde/include/rde_rda.h @@ -50,9 +50,9 @@ ** */ -typedef enum { +enum RDE_RDA_SOCK_LIMITS { RDE_RDA_SOCK_BUFFER_SIZE = 3200 -} RDE_RDA_SOCK_LIMITS; +}; /*****************************************************************************\ * * @@ -67,27 +67,27 @@ typedef enum { * Forward declarations */ -typedef struct { +struct RDE_RDA_CLIENT { int fd; bool is_async; -} RDE_RDA_CLIENT; +}; /* * Socket Management related information */ -typedef struct sockaddr_un rde_rda_sock_addr; +using rde_rda_sock_addr = sockaddr_un; -typedef struct { +struct RDE_RDA_CB { struct sockaddr_un sock_address; int fd; /* File descriptor */ int flags; /* Flags specified for open */ int client_count; RDE_RDA_CLIENT clients[MAX_RDA_CLIENTS]; -} RDE_RDA_CB; +} ; /***************************************************************\ * * diff --git a/osaf/services/infrastructure/rde/include/rde_rda_common.h b/osaf/services/infrastructure/rde/include/rde_rda_common.h --- a/osaf/services/infrastructure/rde/include/rde_rda_common.h +++ b/osaf/services/infrastructure/rde/include/rde_rda_common.h @@ -48,7 +48,7 @@ /* ** Protocal message primitives for RDE-RDA interaction */ -typedef enum { +enum RDE_RDA_CMD_TYPE { RDE_RDA_UNKNOWN, RDE_RDA_GET_ROLE_REQ, RDE_RDA_GET_ROLE_RES, @@ -60,7 +60,7 @@ typedef enum { RDE_RDA_REG_CB_NACK, RDE_RDA_DISCONNECT_REQ, RDE_RDA_HA_ROLE, -} RDE_RDA_CMD_TYPE; +}; /* ** PDU (Protocol Data Units) for the above diff --git a/osaf/services/infrastructure/rde/rde_amf.c b/osaf/services/infrastructure/rde/rde_amf.cc rename from osaf/services/infrastructure/rde/rde_amf.c rename to osaf/services/infrastructure/rde/rde_amf.cc --- a/osaf/services/infrastructure/rde/rde_amf.c +++ b/osaf/services/infrastructure/rde/rde_amf.cc @@ -20,7 +20,7 @@ #include "rde_cb.h" -static RDE_AMF_CB *rde_amf_get_cb(void) +static RDE_AMF_CB *rde_amf_get_cb() { RDE_CONTROL_BLOCK *rde_cb = rde_get_control_block(); return &rde_cb->rde_amf_cb; @@ -100,7 +100,7 @@ static uint32_t rde_amf_healthcheck_star memset(&Healthy, 0, sizeof(Healthy)); phlth_ptr = getenv("RDE_HA_ENV_HEALTHCHECK_KEY"); - if (phlth_ptr == NULL) { + if (phlth_ptr == nullptr) { /* ** default health check key */ @@ -163,7 +163,7 @@ uint32_t rde_amf_init(RDE_AMF_CB *rde_am return NCSCC_RC_FAILURE; } - amf_error = saAmfComponentRegister(rde_amf_cb->amf_hdl, &sname, (SaNameT *)NULL); + amf_error = saAmfComponentRegister(rde_amf_cb->amf_hdl, &sname, (SaNameT *) nullptr); if (amf_error != SA_AIS_OK) { LOG_ER("saAmfComponentRegister FAILED %u", amf_error); return NCSCC_RC_FAILURE; diff --git a/osaf/services/infrastructure/rde/rde_main.c b/osaf/services/infrastructure/rde/rde_main.cc rename from osaf/services/infrastructure/rde/rde_main.c rename to osaf/services/infrastructure/rde/rde_main.cc --- a/osaf/services/infrastructure/rde/rde_main.c +++ b/osaf/services/infrastructure/rde/rde_main.cc @@ -17,7 +17,7 @@ */ #include <configmake.h> -#include <stdlib.h> +#include <cstdlib> #include <poll.h> #include <libgen.h> @@ -67,7 +67,7 @@ static RDE_CONTROL_BLOCK *rde_cb = &_rde static NCS_SEL_OBJ usr1_sel_obj; -RDE_CONTROL_BLOCK *rde_get_control_block(void) +RDE_CONTROL_BLOCK *rde_get_control_block() { return rde_cb; } @@ -112,7 +112,7 @@ static int fd_to_client_ixd(int fd) return i; } -static void handle_mbx_event(void) +static void handle_mbx_event() { struct rde_msg *msg; @@ -307,18 +307,18 @@ done: * * @return int, 0=OK */ -static int initialize_rde(void) +static int initialize_rde() { RDE_RDA_CB *rde_rda_cb = &rde_cb->rde_rda_cb; int rc = NCSCC_RC_FAILURE; char *val; /* Determine how this process was started, by NID or AMF */ - if (getenv("SA_AMF_COMPONENT_NAME") == NULL) + if (getenv("SA_AMF_COMPONENT_NAME") == nullptr) rde_cb->rde_amf_cb.nid_started = true; - if ((val = getenv("RDE_DISCOVER_PEER_TIMEOUT")) != NULL) - discover_peer_timeout = strtoul(val, NULL, 0); + if ((val = getenv("RDE_DISCOVER_PEER_TIMEOUT")) != nullptr) + discover_peer_timeout = strtoul(val, nullptr, 0); TRACE("discover_peer_timeout=%d", discover_peer_timeout); @@ -393,7 +393,7 @@ int main(int argc, char *argv[]) } if (rde_cb->rde_amf_cb.nid_started && - nid_notify("RDE", rc, NULL) != NCSCC_RC_SUCCESS) { + nid_notify("RDE", rc, nullptr) != NCSCC_RC_SUCCESS) { LOG_ER("nid_notify failed"); goto done; } @@ -456,7 +456,7 @@ int main(int argc, char *argv[]) if (fds[FD_RDA_SERVER].revents & POLLIN) { int newsockfd; - newsockfd = accept(rde_rda_cb->fd, (struct sockaddr *)NULL, NULL); + newsockfd = accept(rde_rda_cb->fd, (struct sockaddr *) nullptr, nullptr); if (newsockfd < 0) { LOG_ER("accept FAILED %s", strerror(errno)); goto done; @@ -475,7 +475,7 @@ int main(int argc, char *argv[]) TRACE("accepted new client, fd=%d, idx=%d, nfds=%lu", newsockfd, rde_rda_cb->client_count, nfds); } - for (i = FD_CLIENT_START; i < nfds; i++) { + for (i = FD_CLIENT_START; static_cast<nfds_t>(i) < nfds; i++) { if (fds[i].revents & POLLIN) { int client_disconnected = 0; TRACE("received msg on fd %u", fds[i].fd); @@ -496,7 +496,7 @@ int main(int argc, char *argv[]) init_failed: if (rde_cb->rde_amf_cb.nid_started && - nid_notify("RDE", NCSCC_RC_FAILURE, NULL) != NCSCC_RC_SUCCESS) { + nid_notify("RDE", NCSCC_RC_FAILURE, nullptr) != NCSCC_RC_SUCCESS) { LOG_ER("nid_notify failed"); rc = NCSCC_RC_FAILURE; } diff --git a/osaf/services/infrastructure/rde/rde_mds.c b/osaf/services/infrastructure/rde/rde_mds.cc rename from osaf/services/infrastructure/rde/rde_mds.c rename to osaf/services/infrastructure/rde/rde_mds.cc --- a/osaf/services/infrastructure/rde/rde_mds.c +++ b/osaf/services/infrastructure/rde/rde_mds.cc @@ -76,7 +76,7 @@ static uint32_t msg_decode(MDS_CALLBACK_ goto done; } - msg = malloc(sizeof(*msg)); + msg = static_cast<rde_msg*>(malloc(sizeof(*msg))); assert(msg); dec_info->o_msg = msg; @@ -84,7 +84,7 @@ static uint32_t msg_decode(MDS_CALLBACK_ data = ncs_dec_flatten_space(uba, data_buff, sizeof(uint32_t)); assert(data); - msg->type = ncs_decode_32bit(&data); + msg->type = static_cast<RDE_MSG_TYPE>(ncs_decode_32bit(&data)); ncs_dec_skip_space(uba, sizeof(uint32_t)); switch (msg->type) { @@ -92,7 +92,7 @@ static uint32_t msg_decode(MDS_CALLBACK_ case RDE_MSG_PEER_INFO_RESP: data = ncs_dec_flatten_space(uba, data_buff, sizeof(uint32_t)); assert(data); - msg->info.peer_info.ha_role = ncs_decode_32bit(&data); + msg->info.peer_info.ha_role = static_cast<PCS_RDA_ROLE>(ncs_decode_32bit(&data)); ncs_dec_skip_space(uba, sizeof(uint32_t)); break; @@ -108,7 +108,7 @@ done: static int mbx_send(RDE_MSG_TYPE type, MDS_DEST fr_dest, NODE_ID fr_node_id) { uint32_t rc = NCSCC_RC_SUCCESS; - struct rde_msg *msg = calloc(1, sizeof(struct rde_msg)); + struct rde_msg *msg = static_cast<rde_msg*>(calloc(1, sizeof(struct rde_msg))); RDE_CONTROL_BLOCK *cb = rde_get_control_block(); msg->type = type; diff --git a/osaf/services/infrastructure/rde/rde_rda.c b/osaf/services/infrastructure/rde/rde_rda.cc rename from osaf/services/infrastructure/rde/rde_rda.c rename to osaf/services/infrastructure/rde/rde_rda.cc --- a/osaf/services/infrastructure/rde/rde_rda.c +++ b/osaf/services/infrastructure/rde/rde_rda.cc @@ -299,7 +299,7 @@ static uint32_t rde_rda_process_set_role TRACE_ENTER(); - if (rde_set_role(role) != NCSCC_RC_SUCCESS) + if (rde_set_role(static_cast<PCS_RDA_ROLE>(role)) != NCSCC_RC_SUCCESS) sprintf(msg, "%d", RDE_RDA_SET_ROLE_NACK); else sprintf(msg, "%d", RDE_RDA_SET_ROLE_ACK); @@ -529,12 +529,12 @@ uint32_t rde_rda_client_process_msg(RDE_ ** Parse the message for cmd type and value */ ptr = strchr(msg, ' '); - if (ptr == NULL) { - cmd_type = atoi(msg); + if (ptr == nullptr) { + cmd_type = static_cast<RDE_RDA_CMD_TYPE>(atoi(msg)); } else { *ptr = '\0'; - cmd_type = atoi(msg); + cmd_type = static_cast<RDE_RDA_CMD_TYPE>(atoi(msg)); value = atoi(++ptr); } @@ -584,7 +584,7 @@ uint32_t rde_rda_send_role(int role) { int index; char msg[64] = { 0 }; - RDE_RDA_CB *rde_rda_cb = NULL; + RDE_RDA_CB *rde_rda_cb = nullptr; RDE_CONTROL_BLOCK *rde_cb = rde_get_control_block(); rde_rda_cb = &rde_cb->rde_rda_cb; ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel