ACK not tested -AVM
On 8/25/2016 10:06 AM, Vo Minh Hoang wrote: > Dear Mahesh, > > Logic of this part is complicated so I modified it wrong. > This time I correct it, not a roll back. > That part is subsequence of if clause above. > > Sincerely, > Hoang > > -----Original Message----- > From: A V Mahesh [mailto:mahesh.va...@oracle.com] > Sent: Thursday, August 25, 2016 11:21 AM > To: Hoang Vo <hoang.m...@dektech.com.au> > Cc: opensaf-devel@lists.sourceforge.net > Subject: Re: [PATCH 1 of 1] imported patch > 1967_fix_headless_error_cppcheck.patch > > Hi Hoang, > > Is this rollback of `ckpt: fix cppcheck warning [#1874]` ? > > =================================================================== > > @@ -4766,6 +4758,13 @@ static uint32_t cpnd_transfer_replica(CP > total_num++; > tmp_sec_info = > cpnd_ckpt_sec_get_next(&cp_node->replica_info, tmp_sec_info); > + if (tmp_sec_info == NULL) { > + rc = NCSCC_RC_FAILURE; > + TRACE_4("cpnd ckpt memory get next allocation failed"); > + send_evt.info.cpnd.info.ckpt_nd2nd_sync.data = sec_data; > + > cpnd_proc_free_cpsv_ckpt_data(send_evt.info.cpnd.info.ckpt_nd2nd_sync.data); > + return rc; > + } > } > > =================================================================== > > -AVM > > On 8/24/2016 7:06 PM, Hoang Vo wrote: >> osaf/services/saf/cpsv/cpd/cpd_proc.c | 4 ++-- >> osaf/services/saf/cpsv/cpnd/cpnd_evt.c | 11 ++--------- >> 2 files changed, 4 insertions(+), 11 deletions(-) >> >> >> diff --git a/osaf/services/saf/cpsv/cpd/cpd_proc.c >> b/osaf/services/saf/cpsv/cpd/cpd_proc.c >> --- a/osaf/services/saf/cpsv/cpd/cpd_proc.c >> +++ b/osaf/services/saf/cpsv/cpd/cpd_proc.c >> @@ -1142,7 +1142,7 @@ void cpd_cb_dump(void) >> >> > TRACE("------------------------------------------------------"); >> TRACE(" CKPT ID: = %d", > (uint32_t)ckpt_node->ckpt_id); >> - TRACE(" CKPT Name len = %lu", > strlen(ckpt_node->ckpt_name)); >> + TRACE(" CKPT Name len = %zu", > strlen(ckpt_node->ckpt_name)); >> TRACE(" CKPT Name: %s", > ckpt_node->ckpt_name); >> >> TRACE(" UNLINK = %d, Active Exists = %d", >> ckpt_node->is_unlink_set, @@ -1196,7 +1196,7 @@ void cpd_cb_dump(void) >> name = ckpt_map_node->ckpt_name; >> >> > TRACE("------------------------------------------------------"); >> - TRACE(" CKPT Name len = %lu", > strlen(name)); >> + TRACE(" CKPT Name len = %zu", > strlen(name)); >> TRACE(" CKPT Name: %s", name); >> >> TRACE(" CKPT ID: = %d", > (uint32_t)ckpt_map_node->ckpt_id); >> diff --git a/osaf/services/saf/cpsv/cpnd/cpnd_evt.c >> b/osaf/services/saf/cpsv/cpnd/cpnd_evt.c >> --- a/osaf/services/saf/cpsv/cpnd/cpnd_evt.c >> +++ b/osaf/services/saf/cpsv/cpnd/cpnd_evt.c >> @@ -4700,8 +4700,8 @@ static uint32_t cpnd_transfer_replica(CP >> >> while (1) { >> >> - if (((size + tmp_sec_info->sec_size) > > MAX_SYNC_TRANSFER_SIZE) >> - || (total_num == cp_node->replica_info.n_secs)) { >> + if ((total_num == cp_node->replica_info.n_secs) || >> + ((size + tmp_sec_info->sec_size) > MAX_SYNC_TRANSFER_SIZE)) > { >> >> send_evt.info.cpnd.info.ckpt_nd2nd_sync.num_of_elmts > = num; >> send_evt.info.cpnd.info.ckpt_nd2nd_sync.data = > sec_data; @@ >> -4758,13 +4758,6 @@ static uint32_t cpnd_transfer_replica(CP >> total_num++; >> >> tmp_sec_info = > cpnd_ckpt_sec_get_next(&cp_node->replica_info, tmp_sec_info); >> - if (tmp_sec_info == NULL) { >> - rc = NCSCC_RC_FAILURE; >> - TRACE_4("cpnd ckpt memory get next allocation > failed"); >> - send_evt.info.cpnd.info.ckpt_nd2nd_sync.data = > sec_data; >> - > cpnd_proc_free_cpsv_ckpt_data(send_evt.info.cpnd.info.ckpt_nd2nd_sync.data); >> - return rc; >> - } >> } >> >> TRACE_LEAVE(); > ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
