Re: [devel] [PATCH 1/1] ntf: Fix coding issues identified by codechecker [#3114]

2019-11-18 Thread Minh Hon Chau 

Hi Thuan

ack from me.

Thanks

Minh

On 4/11/19 6:42 pm, thuan.tran wrote:

---
  src/ntf/agent/ntfa_api.c | 29 +++--
  1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/ntf/agent/ntfa_api.c b/src/ntf/agent/ntfa_api.c
index 417c9d688..e89479bf6 100644
--- a/src/ntf/agent/ntfa_api.c
+++ b/src/ntf/agent/ntfa_api.c
@@ -1379,30 +1379,31 @@ SaAisErrorT recoverClient(ntfa_client_hdl_rec_t 
*client_hdl)
if ((rc = reinitializeClient(client_hdl)) == SA_AIS_OK) {
/* Restore reader */
ntfa_reader_hdl_rec_t *reader_hdl = client_hdl->reader_list;
-   while (reader_hdl != NULL && rc == SA_AIS_OK) {
+   while (reader_hdl != NULL) {
rc = recoverReader(client_hdl, reader_hdl);
+   if (rc != SA_AIS_OK) {
+   TRACE("Failed to restore reader (readerId:%d)",
+ reader_hdl->reader_id);
+   goto done;
+   }
reader_hdl = reader_hdl->next;
}
-   if (rc != SA_AIS_OK) {
-   TRACE("Failed to restore reader (readerId:%d)",
- reader_hdl->reader_id);
-   goto done;
-   }
/* Restore subscriber */
ntfa_subscriber_list_t *subscriber_hdl = subscriberNoList;
-   while (subscriber_hdl != NULL && rc == SA_AIS_OK) {
+   while (subscriber_hdl != NULL) {
if (client_hdl->local_hdl ==
-   subscriber_hdl->subscriberListNtfHandle)
+   subscriber_hdl->subscriberListNtfHandle) {
rc = recoverSubscriber(client_hdl,
   subscriber_hdl);
+   if (rc != SA_AIS_OK) {
+   TRACE(
+   "Failed to restore subscriber 
(subscriptionId:%d)",
+   
subscriber_hdl->subscriberListSubscriptionId);
+   goto done;
+   }
+   }
subscriber_hdl = subscriber_hdl->next;
}
-   if (rc != SA_AIS_OK) {
-   TRACE(
-   "Failed to restore subscriber (subscriptionId:%d)",
-   subscriber_hdl->subscriberListSubscriptionId);
-   goto done;
-   }
client_hdl->valid = true;
} else {
TRACE("Failed to restore client (id:%d)",



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

[devel] [PATCH 1/1] ntf: Fix coding issues identified by codechecker [#3114]

2019-11-04 Thread thuan.tran 
---
 src/ntf/agent/ntfa_api.c | 29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/ntf/agent/ntfa_api.c b/src/ntf/agent/ntfa_api.c
index 417c9d688..e89479bf6 100644
--- a/src/ntf/agent/ntfa_api.c
+++ b/src/ntf/agent/ntfa_api.c
@@ -1379,30 +1379,31 @@ SaAisErrorT recoverClient(ntfa_client_hdl_rec_t 
*client_hdl)
if ((rc = reinitializeClient(client_hdl)) == SA_AIS_OK) {
/* Restore reader */
ntfa_reader_hdl_rec_t *reader_hdl = client_hdl->reader_list;
-   while (reader_hdl != NULL && rc == SA_AIS_OK) {
+   while (reader_hdl != NULL) {
rc = recoverReader(client_hdl, reader_hdl);
+   if (rc != SA_AIS_OK) {
+   TRACE("Failed to restore reader (readerId:%d)",
+ reader_hdl->reader_id);
+   goto done;
+   }
reader_hdl = reader_hdl->next;
}
-   if (rc != SA_AIS_OK) {
-   TRACE("Failed to restore reader (readerId:%d)",
- reader_hdl->reader_id);
-   goto done;
-   }
/* Restore subscriber */
ntfa_subscriber_list_t *subscriber_hdl = subscriberNoList;
-   while (subscriber_hdl != NULL && rc == SA_AIS_OK) {
+   while (subscriber_hdl != NULL) {
if (client_hdl->local_hdl ==
-   subscriber_hdl->subscriberListNtfHandle)
+   subscriber_hdl->subscriberListNtfHandle) {
rc = recoverSubscriber(client_hdl,
   subscriber_hdl);
+   if (rc != SA_AIS_OK) {
+   TRACE(
+   "Failed to restore subscriber 
(subscriptionId:%d)",
+   
subscriber_hdl->subscriberListSubscriptionId);
+   goto done;
+   }
+   }
subscriber_hdl = subscriber_hdl->next;
}
-   if (rc != SA_AIS_OK) {
-   TRACE(
-   "Failed to restore subscriber (subscriptionId:%d)",
-   subscriber_hdl->subscriberListSubscriptionId);
-   goto done;
-   }
client_hdl->valid = true;
} else {
TRACE("Failed to restore client (id:%d)",
-- 
2.17.1



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