diff options
author | Thomas Haller <thaller@redhat.com> | 2018-09-26 10:36:54 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-09-26 11:24:09 +0200 |
commit | d7017005e1ffe169ee110bfccfb01fa2345ceb13 (patch) | |
tree | 1f86c00816baf965111ee05e68b8bc98060c8ca6 | |
parent | ad10e79ae4ce018f59686030727c8d1d4749b85b (diff) | |
download | NetworkManager-d7017005e1ffe169ee110bfccfb01fa2345ceb13.tar.gz |
dns: use NM_CMP_*() macros sorting IP config in DNS manager
-rw-r--r-- | src/dns/nm-dns-manager.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 7b81e3a4bf..fc1545e521 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -312,37 +312,23 @@ _config_data_free (NMDnsConfigData *data) } static int -_ip_config_data_cmp (const NMDnsIPConfigData *a, const NMDnsIPConfigData *b) +_ip_config_lst_cmp (const CList *a_lst, + const CList *b_lst, + const void *user_data) { - int a_prio, b_prio; - - a_prio = nm_ip_config_get_dns_priority (a->ip_config); - b_prio = nm_ip_config_get_dns_priority (b->ip_config); + const NMDnsIPConfigData *a = c_list_entry (a_lst, NMDnsIPConfigData, ip_config_lst); + const NMDnsIPConfigData *b = c_list_entry (b_lst, NMDnsIPConfigData, ip_config_lst); /* Configurations with lower priority value first */ - if (a_prio < b_prio) - return -1; - else if (a_prio > b_prio) - return 1; + NM_CMP_DIRECT (nm_ip_config_get_dns_priority (a->ip_config), + nm_ip_config_get_dns_priority (b->ip_config)); /* Sort also according to type */ - if (a->ip_config_type > b->ip_config_type) - return -1; - else if (a->ip_config_type < b->ip_config_type) - return 1; + NM_CMP_DIRECT (a->ip_config_type, b->ip_config_type); return 0; } -static int -_ip_config_lst_cmp (const CList *a, - const CList *b, - const void *user_data) -{ - return _ip_config_data_cmp (c_list_entry (a, NMDnsIPConfigData, ip_config_lst), - c_list_entry (b, NMDnsIPConfigData, ip_config_lst)); -} - static CList * _ip_config_lst_head (NMDnsManager *self) { |