diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index 7b05a40b08d..05c729d34da 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -194,8 +194,7 @@ int in_addr_prefix_intersect( assert(a); assert(b); - /* Checks whether there are any addresses that are in both - * networks */ + /* Checks whether there are any addresses that are in both networks */ m = MIN(aprefixlen, bprefixlen); @@ -203,7 +202,7 @@ int in_addr_prefix_intersect( uint32_t x, nm; x = be32toh(a->in.s_addr ^ b->in.s_addr); - nm = (m == 0) ? 0 : 0xFFFFFFFFUL << (32 - m); + nm = m == 0 ? 0 : 0xFFFFFFFFUL << (32 - m); return (x & nm) == 0; } diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 3dd6f4df597..fb0b38fa49d 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -815,7 +815,7 @@ int wait_for_terminate_with_timeout(pid_t pid, usec_t timeout) { if (status.si_pid == pid) { /* This is the correct child. */ if (status.si_code == CLD_EXITED) - return (status.si_status == 0) ? 0 : -EPROTO; + return status.si_status == 0 ? 0 : -EPROTO; else return -EPROTO; } diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index fdbc55b884f..3e3268b4d4a 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -734,12 +734,12 @@ static bool menu_run( if (refresh) { for (UINTN i = idx_first; i <= idx_last && i < config->entry_count; i++) { print_at(x_start, y_start + i - idx_first, - (i == idx_highlight) ? COLOR_HIGHLIGHT : COLOR_ENTRY, + i == idx_highlight ? COLOR_HIGHLIGHT : COLOR_ENTRY, lines[i]); if (i == config->idx_default_efivar) print_at(x_start, y_start + i - idx_first, - (i == idx_highlight) ? COLOR_HIGHLIGHT : COLOR_ENTRY, + i == idx_highlight ? COLOR_HIGHLIGHT : COLOR_ENTRY, unicode_supported() ? L" ►" : L"=>"); } refresh = false; diff --git a/src/core/job.c b/src/core/job.c index 419fe54bf0c..032554a0ac5 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -142,7 +142,7 @@ void job_uninstall(Job *j) { job_set_state(j, JOB_WAITING); - pj = (j->type == JOB_NOP) ? &j->unit->nop_job : &j->unit->job; + pj = j->type == JOB_NOP ? &j->unit->nop_job : &j->unit->job; assert(*pj == j); /* Detach from next 'bigger' objects */ @@ -203,7 +203,7 @@ Job* job_install(Job *j) { assert(j->type < _JOB_TYPE_MAX_IN_TRANSACTION); assert(j->state == JOB_WAITING); - pj = (j->type == JOB_NOP) ? &j->unit->nop_job : &j->unit->job; + pj = j->type == JOB_NOP ? &j->unit->nop_job : &j->unit->job; uj = *pj; if (uj) { @@ -264,7 +264,7 @@ int job_install_deserialized(Job *j) { "Invalid job type %s in deserialization.", strna(job_type_to_string(j->type))); - pj = (j->type == JOB_NOP) ? &j->unit->nop_job : &j->unit->job; + pj = j->type == JOB_NOP ? &j->unit->nop_job : &j->unit->job; if (*pj) return log_unit_debug_errno(j->unit, SYNTHETIC_ERRNO(EEXIST), "Unit already has a job installed. Not installing deserialized job."); diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c index 9748f8dd402..b2efd5246df 100644 --- a/src/libsystemd-network/dhcp-packet.c +++ b/src/libsystemd-network/dhcp-packet.c @@ -45,7 +45,7 @@ int dhcp_message_init( "hlen" (hardware address length) MUST be 0. "chaddr" (client hardware address) field MUST be zeroed. */ - message->hlen = (arp_type == ARPHRD_INFINIBAND) ? 0 : hlen; + message->hlen = arp_type == ARPHRD_INFINIBAND ? 0 : hlen; memcpy_safe(message->chaddr, chaddr, message->hlen); message->xid = htobe32(xid); diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index acf0f20d859..4f934dd01dc 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -49,7 +49,7 @@ static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotificati sd->session->manager->bus, &m, path, "org.freedesktop.login1.Session", - (type == SESSION_DEVICE_RESUME) ? "ResumeDevice" : "PauseDevice"); + type == SESSION_DEVICE_RESUME ? "ResumeDevice" : "PauseDevice"); if (!m) return r; diff --git a/src/network/networkd-state-file.c b/src/network/networkd-state-file.c index 502da1afb2b..d62cca6dd50 100644 --- a/src/network/networkd-state-file.c +++ b/src/network/networkd-state-file.c @@ -204,7 +204,7 @@ int manager_save(Manager *m) { const char *domainname; char **domains = NULL; - target_domains = (link->network->dhcp_use_domains == DHCP_USE_DOMAINS_YES) ? &search_domains : &route_domains; + target_domains = link->network->dhcp_use_domains == DHCP_USE_DOMAINS_YES ? &search_domains : &route_domains; r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname); if (r >= 0) { r = ordered_set_put_strdup(target_domains, domainname); diff --git a/src/resolve/resolved-dns-transaction.h b/src/resolve/resolved-dns-transaction.h index ab86f0f01f5..5a0e35704cd 100644 --- a/src/resolve/resolved-dns-transaction.h +++ b/src/resolve/resolved-dns-transaction.h @@ -213,8 +213,8 @@ DnsTransactionSource dns_transaction_source_from_string(const char *s) _pure_; /* Maximum attempts to send MDNS requests, see RFC 6762 Section 8.1 */ #define MDNS_TRANSACTION_ATTEMPTS_MAX 3 -#define TRANSACTION_ATTEMPTS_MAX(p) (((p) == DNS_PROTOCOL_LLMNR) ? \ - LLMNR_TRANSACTION_ATTEMPTS_MAX : \ - (((p) == DNS_PROTOCOL_MDNS) ? \ - MDNS_TRANSACTION_ATTEMPTS_MAX : \ - DNS_TRANSACTION_ATTEMPTS_MAX)) +#define TRANSACTION_ATTEMPTS_MAX(p) ((p) == DNS_PROTOCOL_LLMNR ? \ + LLMNR_TRANSACTION_ATTEMPTS_MAX : \ + (p) == DNS_PROTOCOL_MDNS ? \ + MDNS_TRANSACTION_ATTEMPTS_MAX : \ + DNS_TRANSACTION_ATTEMPTS_MAX)