tree-wide: use IN_SET() more

diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index d3fef01febfc581c9af382cb84a8a2ef17eda27c..9e70c3f01fb2990adc5f72128d4f92f9aa166a2f 100644 (file)
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -221,7 +221,7 @@ int get_locales(char ***ret) {
         locales = set_free(locales);
 
         r = getenv_bool("SYSTEMD_LIST_NON_UTF8_LOCALES");
-        if (r == -ENXIO || r == 0) {
+        if (IN_SET(r, -ENXIO, 0)) {
                 char **a, **b;
 
                 /* Filter out non-UTF-8 locales, because it's 2019, by default */

diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c
index 24ed16e56b5a9d93de506d0f018000d8c88b4c9e..b3b5037a7c6fc712f9c6b5b4fbf96b50c75f350d 100644 (file)
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@ -348,7 +348,7 @@ static int parse_package_metadata(const char *name, JsonVariant *id_json, Elf *e
 
                 /* Package metadata is in PT_NOTE headers. */
                 program_header = sym_gelf_getphdr(elf, i, &mem);
-                if (!program_header || (program_header->p_type != PT_NOTE && program_header->p_type != PT_INTERP))
+                if (!program_header || !IN_SET(program_header->p_type, PT_NOTE, PT_INTERP))
                         continue;
 
                 if (program_header->p_type == PT_INTERP) {

diff --git a/src/shared/pkcs11-util.c b/src/shared/pkcs11-util.c
index edf4fb01b925e13652ded04273a425093ce8bc31..9792f70d42202624eca85fc1eee1abe0afa339f0 100644 (file)
--- a/src/shared/pkcs11-util.c
+++ b/src/shared/pkcs11-util.c
@@ -665,7 +665,7 @@ int pkcs11_token_find_private_key(
                 optional_attributes[1].ulValueLen = sizeof(derive_value);
 
                 rv = m->C_GetAttributeValue(session, candidate, optional_attributes, ELEMENTSOF(optional_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 private key: %s", sym_p11_kit_strerror(rv));
 
@@ -737,7 +737,7 @@ int pkcs11_token_find_related_object(
         CK_RV rv;
 
         rv = m->C_GetAttributeValue(session, prototype, attributes, ELEMENTSOF(attributes));
-        if (rv != CKR_OK && rv != CKR_ATTRIBUTE_TYPE_INVALID)
+        if (!IN_SET(rv, CKR_OK, CKR_ATTRIBUTE_TYPE_INVALID))
                 return log_debug_errno(SYNTHETIC_ERRNO(EIO), "Failed to retrieve length of attributes: %s", sym_p11_kit_strerror(rv));
 
         if (attributes[0].ulValueLen != CK_UNAVAILABLE_INFORMATION) {
@@ -812,7 +812,7 @@ static int ecc_convert_to_compressed(
         int r;
 
         rv = m->C_GetAttributeValue(session, object, &ec_params_attr, 1);
-        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 retrieve length of CKA_EC_PARAMS: %s", sym_p11_kit_strerror(rv));
 
@@ -834,7 +834,7 @@ static int ecc_convert_to_compressed(
 
                 ec_params_attr.ulValueLen = 0;
                 rv = m->C_GetAttributeValue(session, public_key, &ec_params_attr, 1);
-                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 retrieve length of CKA_EC_PARAMS: %s", sym_p11_kit_strerror(rv));