Re: [devel] [PATCH 1 of 1] amfd: fix cppcheck errors [#1642]

[minh chau]

Ack
Thanks,Minh

On 29/08/16 16:13, Gary Lee wrote:
>   osaf/services/saf/amf/amfd/ckpt_enc.cc |  2 +-
>   osaf/services/saf/amf/amfd/ndproc.cc   |  8 ++++----
>   osaf/services/saf/amf/amfd/role.cc     |  3 +--
>   3 files changed, 6 insertions(+), 7 deletions(-)
>
>
> fix cppcheck errors introduced by changing various members of structs to 
> std::string
>
> diff --git a/osaf/services/saf/amf/amfd/ckpt_enc.cc 
> b/osaf/services/saf/amf/amfd/ckpt_enc.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_enc.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_enc.cc
> @@ -2214,7 +2214,7 @@ static uint32_t enc_cs_siass(AVD_CL_CB *
>               su = it->second;
>   
>               for (rel = su->list_of_susi; rel != nullptr; rel = 
> rel->su_next) {
> -                     memcpy(&copy, rel, sizeof(AVD_SU_SI_REL));
> +                     copy = *rel;
>                       copy.csi_add_rem = SA_FALSE;
>                       encode_siass(&enc->io_uba, &copy, enc->i_peer_version);
>                       (*num_of_obj)++;
> diff --git a/osaf/services/saf/amf/amfd/ndproc.cc 
> b/osaf/services/saf/amf/amfd/ndproc.cc
> --- a/osaf/services/saf/amf/amfd/ndproc.cc
> +++ b/osaf/services/saf/amf/amfd/ndproc.cc
> @@ -310,8 +310,8 @@ void avd_nd_sisu_state_info_evh(AVD_CL_C
>   
>       if (cb->node_sync_window_closed == false) {
>               state_info_evt = new AVD_EVT_QUEUE();
> -             state_info_evt->evt = new AVD_EVT();
> -             memcpy(state_info_evt->evt, evt, sizeof(AVD_EVT));
> +             state_info_evt->evt = new AVD_EVT{};
> +             state_info_evt->evt->rcv_evt = evt->rcv_evt;
>               state_info_evt->evt->info.avnd_msg = n2d_msg;
>               cb->evt_queue.push(state_info_evt);
>       }
> @@ -354,8 +354,8 @@ void avd_nd_compcsi_state_info_evh(AVD_C
>   
>       if (cb->node_sync_window_closed == false) {
>               state_info_evt = new AVD_EVT_QUEUE();
> -             state_info_evt->evt = new AVD_EVT();
> -             memcpy(state_info_evt->evt, evt, sizeof(AVD_EVT));
> +             state_info_evt->evt = new AVD_EVT{};
> +             state_info_evt->evt->rcv_evt = evt->rcv_evt;
>               state_info_evt->evt->info.avnd_msg = n2d_msg;
>               cb->evt_queue.push(state_info_evt);
>       }
> diff --git a/osaf/services/saf/amf/amfd/role.cc 
> b/osaf/services/saf/amf/amfd/role.cc
> --- a/osaf/services/saf/amf/amfd/role.cc
> +++ b/osaf/services/saf/amf/amfd/role.cc
> @@ -556,8 +556,7 @@ static uint32_t avd_role_failover_qsd_ac
>                        * Post an evt on mailbox to set active role to all NCS 
> SU
>                        *
>                        */
> -                     AVD_EVT evt;
> -                     memset(&evt, '\0', sizeof(AVD_EVT));
> +                     AVD_EVT evt = {};
>                       evt.rcv_evt = AVD_EVT_SWITCH_NCS_SU;
>   
>                       /* set cb state to active */
>


------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel