fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 21:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: declare nm_dhcp_manager_get() using NM_DEFINE_SINGLETON_GETTER()

Browse source 
(cherry picked from commit fc575d6783)
This commit is contained in:
Thomas Haller 2015-01-05 19:30:00 +01:00 • committed by Jiří Klimeš
parent 7fcb56eaba
commit 4ab08c3e45
3 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dhcp-manager/nm-dhcp-manager.c
View file

@ -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)

5
src/main.c
View file

@ -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);

7
src/nm-iface-helper.c
View file

@ -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,