diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-01-05 19:30:00 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-12-01 13:07:05 +0100 |
| commit | 4ab08c3e450ea86de90b26e8dbca31a5a3526110 (patch) | |
| tree | 7ca721a4315aafa2b2339bbb1311eec8be1fb605 | |
| parent | 7fcb56eaba6303c95482c6c027d5c36c5561f6c5 (diff) | |
| download | NetworkManager-4ab08c3e450ea86de90b26e8dbca31a5a3526110.tar.gz | |
core: declare nm_dhcp_manager_get() using NM_DEFINE_SINGLETON_GETTER()
(cherry picked from commit fc575d678302e079ce6122697e4d7c8824335fe5)
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-manager.c | 11 | ||||
| -rw-r--r-- | src/main.c | 5 | ||||
| -rw-r--r-- | src/nm-iface-helper.c | 7 |
3 files changed, 2 insertions, 21 deletions
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 20ddefc32f..af6ec087f9 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -373,16 +373,7 @@ nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self, /***************************************************/ -NMDhcpManager * -nm_dhcp_manager_get (void) -{ - static NMDhcpManager *singleton = NULL; - - if (G_UNLIKELY (singleton == NULL)) - singleton = g_object_new (NM_TYPE_DHCP_MANAGER, NULL); - g_assert (singleton); - return singleton; -} +NM_DEFINE_SINGLETON_GETTER (NMDhcpManager, nm_dhcp_manager_get, NM_TYPE_DHCP_MANAGER); static void nm_dhcp_manager_init (NMDhcpManager *self) diff --git a/src/main.c b/src/main.c index 8f3c48b4cd..c01d33f4d4 100644 --- a/src/main.c +++ b/src/main.c @@ -294,7 +294,6 @@ main (int argc, char *argv[]) NMManager *manager = NULL; gs_unref_object NMVpnManager *vpn_manager = NULL; gs_unref_object NMSupplicantManager *sup_mgr = NULL; - gs_unref_object NMDhcpManager *dhcp_mgr = NULL; gs_unref_object NMFirewallManager *fw_mgr = NULL; gs_unref_object NMSettings *settings = NULL; gs_unref_object NMConfig *config = NULL; @@ -484,10 +483,6 @@ main (int argc, char *argv[]) vpn_manager = nm_vpn_manager_get (); g_assert (vpn_manager != NULL); - /* Initialize DHCP manager */ - dhcp_mgr = nm_dhcp_manager_get (); - g_assert (dhcp_mgr != NULL); - nm_dispatcher_init (); settings = nm_settings_new (&error); diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 18966c5797..25bde8ed81 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -327,7 +327,6 @@ int main (int argc, char *argv[]) { char *bad_domains = NULL; - gs_unref_object NMDhcpManager *dhcp_mgr = NULL; GError *error = NULL; gboolean wrote_pidfile = FALSE; gs_free char *pidfile = NULL; @@ -437,11 +436,7 @@ main (int argc, char *argv[]) if (global_opt.dhcp4_address) { nm_platform_sysctl_set (NM_PLATFORM_GET, nm_utils_ip4_property_path (global_opt.ifname, "promote_secondaries"), "1"); - /* Initialize DHCP manager */ - dhcp_mgr = nm_dhcp_manager_get (); - g_assert (dhcp_mgr != NULL); - - dhcp4_client = nm_dhcp_manager_start_ip4 (dhcp_mgr, + dhcp4_client = nm_dhcp_manager_start_ip4 (nm_dhcp_manager_get (), global_opt.ifname, ifindex, hwaddr, |