The branch, master has been updated
       via  1905c77a080 lib:replace: Fix NULL issue reported by covscan
       via  ac3c8c536d5 lib:replace: Fix trailing whitespace in os2_delete.c
      from  95c7d23462b vfs: Simplify fake_acls_stat() with an early return

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1905c77a080710dc06c9422e2654a6080d21daa5
Author: Pavel Filipenský <pfili...@redhat.com>
Date:   Thu Jan 27 09:40:28 2022 +0100

    lib:replace: Fix NULL issue reported by covscan
    
    Found by covscan. Coding style kept as in the rest of the file.
    
    Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
    Reviewed-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Jeremy Allison <j...@samba.org>
    
    Autobuild-User(master): Jeremy Allison <j...@samba.org>
    Autobuild-Date(master): Tue Feb  1 21:09:21 UTC 2022 on sn-devel-184

commit ac3c8c536d5462de85bd90db4df73d8517a1051a
Author: Pavel Filipenský <pfili...@redhat.com>
Date:   Thu Jan 27 09:39:29 2022 +0100

    lib:replace: Fix trailing whitespace in os2_delete.c
    
    Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
    Reviewed-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Jeremy Allison <j...@samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/tests/os2_delete.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/tests/os2_delete.c b/lib/replace/tests/os2_delete.c
index df8a8f59ec2..a3e45f7bff3 100644
--- a/lib/replace/tests/os2_delete.c
+++ b/lib/replace/tests/os2_delete.c
@@ -66,8 +66,8 @@ static int os2_delete(DIR *d)
        char names[READDIR_SIZE][256];
 
        /* scan, remembering offsets */
-       for (i=0, de=readdir(d); 
-            de && i < READDIR_SIZE; 
+       for (i=0, de=readdir(d);
+            de && i < READDIR_SIZE;
             de=readdir(d), i++) {
                offsets[i] = telldir(d);
                /* strlcpy not available here */
@@ -106,7 +106,7 @@ int test_readdir_os2_delete(void)
        d = opendir(TESTDIR "/test0.txt");
        if (d != NULL) FAILED("opendir() on file succeed");
        if (errno != ENOTDIR) FAILED("opendir() on file didn't give ENOTDIR");
-       closedir(d);
+       if (d != NULL) closedir(d);
 
        d = opendir(TESTDIR);
 


-- 
Samba Shared Repository

Reply via email to