From a30fdf857b7201a206b90f55473af84b67b19b13 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 2 Apr 2024 18:06:24 +0200 Subject: [PATCH] Use IN_SET() more --- src/cryptsetup/cryptsetup.c | 2 +- src/shared/pkcs11-util.c | 4 ++-- src/shared/ptyfwd.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 7099f68f88b..34ad9ebd145 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -530,7 +530,7 @@ static int parse_one_option(const char *option) { * - text descriptions prefixed with "%:" or "%keyring:". * - text description with no prefix. * - numeric keyring id (ignored in current patch set). */ - if (*val == '@' || *val == '%') + if (IN_SET(*val, '@', '%')) keyring = strndup(val, sep - val); else /* add type prefix if missing (crypt_set_keyring_to_link() expects it) */ diff --git a/src/shared/pkcs11-util.c b/src/shared/pkcs11-util.c index e6feba44bdf..8727fe24845 100644 --- a/src/shared/pkcs11-util.c +++ b/src/shared/pkcs11-util.c @@ -1711,7 +1711,7 @@ static int pkcs11_acquire_public_key_callback( switch (attributes[i].type) { case CKA_CLASS: { CK_OBJECT_CLASS requested_class = *((CK_OBJECT_CLASS*) attributes[i].pValue); - if (requested_class != CKO_PUBLIC_KEY && requested_class != CKO_CERTIFICATE) + if (!IN_SET(requested_class, CKO_PUBLIC_KEY, CKO_CERTIFICATE)) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Selected PKCS#11 object is not a public key or certificate, refusing."); break; @@ -1743,7 +1743,7 @@ static int pkcs11_acquire_public_key_callback( candidate_attributes[0].ulValueLen = sizeof(class); candidate_attributes[1].ulValueLen = sizeof(type); rv = m->C_GetAttributeValue(session, candidate, candidate_attributes, ELEMENTSOF(candidate_attributes)); - if (rv != CKR_OK && rv != CKR_ATTRIBUTE_TYPE_INVALID) + if (!IN_SET(rv, CKR_OK, CKR_ATTRIBUTE_TYPE_INVALID)) return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to get attributes of a selected candidate: %s", sym_p11_kit_strerror(rv)); diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c index bdbd79087ca..7bd8dd6d898 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.c @@ -478,7 +478,7 @@ static int pty_forward_ansi_process(PTYForward *f, size_t offset) { * since we cannot lookahead to see if the Esc is followed by a \ * we cut a corner here and assume it will be \. */ - if (c == '\x07' || c == '\x1b') { + if (IN_SET(c, '\x07', '\x1b')) { r = insert_window_title_fix(f, i+1); if (r < 0) return r; -- 2.47.3