[mynewt-core] branch master updated: sys/log/cbmem: Fix return code for early break in log_cbmem_walk

[ccollins]

This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new bf32947  sys/log/cbmem: Fix return code for early break in 
log_cbmem_walk
bf32947 is described below

commit bf329478be3e737f33abf7a00c9ea15f6b38bd32
Author: Casper Meijn <cas...@meijn.net>
AuthorDate: Tue Oct 6 19:59:18 2020 +0200

    sys/log/cbmem: Fix return code for early break in log_cbmem_walk
    
    The return code of succesfull log_cbmem_walk was 0, even when the loop
    ended early. In case of an early loop break, we want to return the rc of
    the walked function.
    This is needed to make `newtmgr log show --all` work, as the rc is
    passed to the client to indicate more data available.
---
 sys/log/full/src/log_cbmem.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys/log/full/src/log_cbmem.c b/sys/log/full/src/log_cbmem.c
index 31f163e..e7194e7 100644
--- a/sys/log/full/src/log_cbmem.c
+++ b/sys/log/full/src/log_cbmem.c
@@ -176,6 +176,7 @@ log_cbmem_walk(struct log *log, log_walk_func_t walk_func,
     struct cbmem_entry_hdr *hdr;
     struct cbmem_iter iter;
     int rc;
+    int walk_rc = 0;
 
     cbmem = (struct cbmem *) log->l_arg;
 
@@ -190,7 +191,7 @@ log_cbmem_walk(struct log *log, log_walk_func_t walk_func,
     if (log_offset->lo_ts < 0) {
         hdr = cbmem->c_entry_end;
         if (hdr != NULL) {
-            rc = walk_func(log, log_offset, (void *)hdr, hdr->ceh_len);
+            walk_rc = walk_func(log, log_offset, (void *)hdr, hdr->ceh_len);
         }
     } else {
         cbmem_iter_start(cbmem, &iter);
@@ -200,8 +201,8 @@ log_cbmem_walk(struct log *log, log_walk_func_t walk_func,
                 break;
             }
 
-            rc = walk_func(log, log_offset, (void *)hdr, hdr->ceh_len);
-            if (rc == 1) {
+            walk_rc = walk_func(log, log_offset, (void *)hdr, hdr->ceh_len);
+            if (walk_rc != 0) {
                 break;
             }
         }
@@ -212,7 +213,7 @@ log_cbmem_walk(struct log *log, log_walk_func_t walk_func,
         goto err;
     }
 
-    return (0);
+    return (walk_rc);
 err:
     return (rc);
 }