summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-01-02 15:30:46 +0100
committerTom Gundersen <teg@jklm.no>2014-01-02 15:49:23 +0100
commit449f75549247b3b7b073a788f0f099ce6b7c5378 (patch)
treede0940c4fa23175d65e6569610055801e060b21a /src/shared
parentbe9326ca1d207e1df6a033c593393ebbbc433148 (diff)
networkd: improve logging
Remove redundant messages, add some debugging ones and make wording more uniform.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/net-util.c45
1 files changed, 10 insertions, 35 deletions
diff --git a/src/shared/net-util.c b/src/shared/net-util.c
index fa89bd904f..8f8cfc9fdb 100644
--- a/src/shared/net-util.c
+++ b/src/shared/net-util.c
@@ -40,45 +40,20 @@ bool net_match_config(const struct ether_addr *match_mac,
const char *dev_type,
const char *dev_name) {
- if (match_mac) {
- if (!dev_mac || memcmp(match_mac, ether_aton(dev_mac), ETH_ALEN)) {
- log_debug("Interface MAC address (%s) did not match MACAddress=%s",
- dev_mac, ether_ntoa(match_mac));
- return 0;
- }
- }
+ if (match_mac && (!dev_mac || memcmp(match_mac, ether_aton(dev_mac), ETH_ALEN)))
+ return 0;
- if (match_path) {
- if (!streq_ptr(match_path, dev_path)) {
- log_debug("Interface persistent path (%s) did not match Path=%s",
- dev_path, match_path);
- return 0;
- }
- }
+ if (match_path && !streq_ptr(match_path, dev_path))
+ return 0;
- if (match_driver) {
- if (!streq_ptr(match_driver, dev_driver)) {
- log_debug("Interface device driver (%s) did not match Driver=%s",
- dev_driver, match_driver);
- return 0;
- }
- }
+ if (match_driver && !streq_ptr(match_driver, dev_driver))
+ return 0;
- if (match_type) {
- if (!streq_ptr(match_type, dev_type)) {
- log_debug("Interface type (%s) did not match Type=%s",
- dev_type, match_type);
- return 0;
- }
- }
+ if (match_type && !streq_ptr(match_type, dev_type))
+ return 0;
- if (match_name) {
- if (!streq_ptr(match_name, dev_name)) {
- log_debug("Interface name (%s) did not match Name=%s",
- dev_name, match_name);
- return 0;
- }
- }
+ if (match_name && !streq_ptr(match_name, dev_name))
+ return 0;
return 1;
}