The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3282e368e00460de500e5cfcf1c33b597199aaf8

commit 3282e368e00460de500e5cfcf1c33b597199aaf8
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2024-12-21 17:55:11 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2024-12-28 17:01:19 +0000

    thr_cancel.c: style
    
    Reviewed by:    markj
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D48200
---
 lib/libthr/thread/thr_cancel.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index b1b95e54b46f..0e00c2c36086 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.c
@@ -99,9 +99,9 @@ _thr_setcancelstate(int state, int *oldstate)
                return (EINVAL);
        }
 
-       if (oldstate) {
+       if (oldstate != NULL) {
                *oldstate = oldval ? PTHREAD_CANCEL_ENABLE :
-                       PTHREAD_CANCEL_DISABLE;
+                   PTHREAD_CANCEL_DISABLE;
        }
        return (0);
 }
@@ -125,9 +125,9 @@ _thr_setcanceltype(int type, int *oldtype)
                return (EINVAL);
        }
 
-       if (oldtype) {
+       if (oldtype != NULL) {
                *oldtype = oldval ? PTHREAD_CANCEL_ASYNCHRONOUS :
-                       PTHREAD_CANCEL_DEFERRED;
+                   PTHREAD_CANCEL_DEFERRED;
        }
        return (0);
 }

Reply via email to