chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: rename unit_destroy_cgroup() to unit_destroy_cgroup_if_empty() since it's not...
[elogind.git]
/
src
/
libsystemd-network
/
network-internal.c
diff --git
a/src/libsystemd-network/network-internal.c
b/src/libsystemd-network/network-internal.c
index f3141f75dca3da84f59ee5ec82854b2fbef6599d..90f830a3517c542e76e290d308e514c0b5a37a79 100644
(file)
--- a/
src/libsystemd-network/network-internal.c
+++ b/
src/libsystemd-network/network-internal.c
@@
-32,7
+32,7
@@
#include "utf8.h"
#include "util.h"
#include "conf-parser.h"
#include "utf8.h"
#include "util.h"
#include "conf-parser.h"
-#include "condition
-util
.h"
+#include "condition.h"
#include "network-internal.h"
const char *net_get_name(struct udev_device *device) {
#include "network-internal.h"
const char *net_get_name(struct udev_device *device) {
@@
-99,37
+99,37
@@
bool net_match_config(const struct ether_addr *match_mac,
const char *dev_name) {
if (match_host && !condition_test(match_host))
const char *dev_name) {
if (match_host && !condition_test(match_host))
- return
0
;
+ return
false
;
if (match_virt && !condition_test(match_virt))
if (match_virt && !condition_test(match_virt))
- return
0
;
+ return
false
;
if (match_kernel && !condition_test(match_kernel))
if (match_kernel && !condition_test(match_kernel))
- return
0
;
+ return
false
;
if (match_arch && !condition_test(match_arch))
if (match_arch && !condition_test(match_arch))
- return
0
;
+ return
false
;
if (match_mac && (!dev_mac || memcmp(match_mac, dev_mac, ETH_ALEN)))
if (match_mac && (!dev_mac || memcmp(match_mac, dev_mac, ETH_ALEN)))
- return
0
;
+ return
false
;
if (match_path && (!dev_path || fnmatch(match_path, dev_path, 0)))
if (match_path && (!dev_path || fnmatch(match_path, dev_path, 0)))
- return
0
;
+ return
false
;
if (match_driver) {
if (dev_parent_driver && !streq(match_driver, dev_parent_driver))
if (match_driver) {
if (dev_parent_driver && !streq(match_driver, dev_parent_driver))
- return
0
;
+ return
false
;
else if (!streq_ptr(match_driver, dev_driver))
else if (!streq_ptr(match_driver, dev_driver))
- return
0
;
+ return
false
;
}
if (match_type && !streq_ptr(match_type, dev_type))
}
if (match_type && !streq_ptr(match_type, dev_type))
- return
0
;
+ return
false
;
if (match_name && (!dev_name || fnmatch(match_name, dev_name, 0)))
if (match_name && (!dev_name || fnmatch(match_name, dev_name, 0)))
-
return 0
;
+
return false
;
- return
1
;
+ return
true
;
}
int config_parse_net_condition(const char *unit,
}
int config_parse_net_condition(const char *unit,