diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-11-06 02:02:13 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-11-06 14:21:10 +0100 |
| commit | a4705396adbf1a8a3e52ed133d9b1f12cb13e77e (patch) | |
| tree | 46818d00ad1b0eff9cb83658be87ac6c3b39233a /src/libsystemd-network/network-internal.c | |
| parent | d1bddcec98551ea748f39a742a4cbcf9ea9254ef (diff) | |
condition: internalize condition test functions
Also, implement the negation check inside of condition_test() instead of
individually in each test function.
Diffstat (limited to 'src/libsystemd-network/network-internal.c')
| -rw-r--r-- | src/libsystemd-network/network-internal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index 372f3ed371..6f16050cdc 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -98,16 +98,16 @@ bool net_match_config(const struct ether_addr *match_mac, const char *dev_type, const char *dev_name) { - if (match_host && !condition_test_host(match_host)) + if (match_host && !condition_test(match_host)) return 0; - if (match_virt && !condition_test_virtualization(match_virt)) + if (match_virt && !condition_test(match_virt)) return 0; - if (match_kernel && !condition_test_kernel_command_line(match_kernel)) + if (match_kernel && !condition_test(match_kernel)) return 0; - if (match_arch && !condition_test_architecture(match_arch)) + if (match_arch && !condition_test(match_arch)) return 0; if (match_mac && (!dev_mac || memcmp(match_mac, dev_mac, ETH_ALEN))) |