colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns: fix NMDnsPluginPrivate and drop unused fields

Browse Source 
NM_DNS_PLUGIN_GET_PRIVATE() macro was broken. Also NMDnsPluginPrivate
contained unused fields. Fix that.

The private data is unused at the moment, but will be used next.
Hence it is fixed and not removed.
This commit is contained in:
Thomas Haller
2022-04-07 13:29:33 +02:00
parent 068ca09d16
commit 0001a2fd0c
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/dns/nm-dns-plugin.c
View File

@@ -18,10 +18,7 @@
/*****************************************************************************/ /*****************************************************************************/
typedef struct _NMDnsPluginPrivate { typedef struct _NMDnsPluginPrivate {
GPid pid; int _dummy;
guint watch_id;
char *progname;
char *pidfile;
} NMDnsPluginPrivate; } NMDnsPluginPrivate;
G_DEFINE_ABSTRACT_TYPE(NMDnsPlugin, nm_dns_plugin, G_TYPE_OBJECT) G_DEFINE_ABSTRACT_TYPE(NMDnsPlugin, nm_dns_plugin, G_TYPE_OBJECT)
@@ -110,9 +107,19 @@ nm_dns_plugin_stop(NMDnsPlugin *self)
static void static void
nm_dns_plugin_init(NMDnsPlugin *self) nm_dns_plugin_init(NMDnsPlugin *self)
{ {
NMDnsPluginPrivate *priv;
priv = G_TYPE_INSTANCE_GET_PRIVATE(self, NM_TYPE_DNS_PLUGIN, NMDnsPluginPrivate);
self->_priv = priv;
nm_shutdown_wait_obj_register_object(self, "dns-plugin"); nm_shutdown_wait_obj_register_object(self, "dns-plugin");
} }
static void static void
nm_dns_plugin_class_init(NMDnsPluginClass *plugin_class) nm_dns_plugin_class_init(NMDnsPluginClass *klass)
{} {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
g_type_class_add_private(object_class, sizeof(NMDnsPluginPrivate));
}

5
src/core/dns/nm-dns-plugin.h
View File

@@ -19,8 +19,11 @@
#define NM_DNS_PLUGIN_GET_CLASS(obj) \ #define NM_DNS_PLUGIN_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DNS_PLUGIN, NMDnsPluginClass)) (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DNS_PLUGIN, NMDnsPluginClass))
struct _NMDnsPluginPrivate;
typedef struct { typedef struct {
GObject parent; GObject parent;
struct _NMDnsPluginPrivate *_priv;
} NMDnsPlugin; } NMDnsPlugin;
typedef struct { typedef struct {