fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 03:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifnet: avoid compiler warning about casting function pointers

Browse source 
../../src/settings/plugins/ifnet/nms-ifnet-plugin.c: In function ‘monitor_file_changes’:
  ../../src/settings/plugins/ifnet/nms-ifnet-plugin.c:140:42: error: cast between incompatible function types from ‘void (*)(void *)’ to ‘void (*)(void *, GObject *)’ {aka ‘void (*)(void *, struct _GObject *)’} [-Werror=cast-function-type]
     g_object_weak_ref (G_OBJECT (monitor), (GWeakNotify) g_free,
                                            ^

(cherry picked from commit dccc449522)
This commit is contained in:
Thomas Haller 2018-06-16 08:48:01 +02:00
parent fa1f2bc26c
commit d7170e21fc
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/settings/plugins/ifnet/nms-ifnet-plugin.c
View file

@ -118,6 +118,13 @@ file_changed (GFileMonitor * monitor,
}
}
static void
_weak_ref_cb (gpointer data,
GObject *where_the_object_was)
{
g_free (data);
}
static GFileMonitor *
monitor_file_changes (const char *filename,
FileChangedFn callback, gpointer user_data)
@ -137,10 +144,10 @@ monitor_file_changes (const char *filename,
info = g_new0 (FileMonitorInfo, 1);
info->callback = callback;
info->user_data = user_data;
g_object_weak_ref (G_OBJECT (monitor), (GWeakNotify) g_free,
info);
g_object_weak_ref (G_OBJECT (monitor), _weak_ref_cb,
info);
g_signal_connect (monitor, "changed", G_CALLBACK (file_changed),
info);
info);
} else {
nm_log_warn (LOGD_SETTINGS, "Monitoring %s failed, error: %s", filename,
error == NULL ? "nothing" : (*error)->message);