fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 07:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: don't overwrite get_connection_iface() by default

Browse source 
Factories that overwrite this function are not supposed to chain
up the parent implementation. Thus there is no reason to have
a default implementation and it's clearer to inline it.
This commit is contained in:
Thomas Haller 2016-02-17 16:09:42 +01:00
parent ca0dbefb02
commit f31954c071
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/devices/nm-device-factory.c
View file

@ -157,37 +157,26 @@ nm_device_factory_get_connection_parent (NMDeviceFactory *factory,
return NULL;
}
static char *
get_connection_iface (NMDeviceFactory *factory,
NMConnection *connection,
const char *parent_iface)
{
/* Default to just using NMSettingConnection:interface-name */
return g_strdup (nm_connection_get_interface_name (connection));
}
char *
nm_device_factory_get_connection_iface (NMDeviceFactory *factory,
NMConnection *connection,
const char *parent_iface,
GError **error)
{
NMDeviceFactoryInterface *klass;
char *ifname;
g_return_val_if_fail (factory != NULL, NULL);
g_return_val_if_fail (connection != NULL, NULL);
g_return_val_if_fail (!error || !*error, NULL);
if (!NM_DEVICE_FACTORY_GET_INTERFACE (factory)->get_connection_iface) {
g_set_error (error,
NM_MANAGER_ERROR,
NM_MANAGER_ERROR_FAILED,
"failed to determine interface name: cannot determine name for %s",
nm_connection_get_connection_type (connection));
return NULL;
}
klass = NM_DEVICE_FACTORY_GET_INTERFACE (factory);
if (klass->get_connection_iface)
ifname = klass->get_connection_iface (factory, connection, parent_iface);
else
ifname = g_strdup (nm_connection_get_interface_name (connection));
ifname = NM_DEVICE_FACTORY_GET_INTERFACE (factory)->get_connection_iface (factory, connection, parent_iface);
if (!ifname) {
g_set_error (error,
NM_MANAGER_ERROR,
@ -215,8 +204,6 @@ nm_device_factory_get_connection_iface (NMDeviceFactory *factory,
static void
nm_device_factory_default_init (NMDeviceFactoryInterface *factory_iface)
{
factory_iface->get_connection_iface = get_connection_iface;
/* Signals */
signals[DEVICE_ADDED] = g_signal_new (NM_DEVICE_FACTORY_DEVICE_ADDED,
NM_TYPE_DEVICE_FACTORY,