Commit 2be38f69 authored by David Zeuthen's avatar David Zeuthen

GDBus: update padding

Add lots of padding for public class structures. Notably, we seemed to
lack any padding whatsoever in the GDBusMessageClass struct (spotted
by Dan Winship). Also switch to using

 gpointer padding[N];

instead of

 void (*_g_reserved1) (void);
 ...
 void (*_g_reservedN) (void);
Signed-off-by: default avatarDavid Zeuthen <davidz@redhat.com>
parent d19380c8
......@@ -46,6 +46,10 @@ struct _GDBusAuthClass
{
/*< private >*/
GObjectClass parent_class;
/*< private >*/
/* Padding for future expansion */
gpointer padding[16];
};
struct _GDBusAuth
......
......@@ -101,25 +101,9 @@ struct _GDBusAuthMechanismClass
gsize *out_data_len);
void (*client_shutdown) (GDBusAuthMechanism *mechanism);
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
void (*_g_reserved9) (void);
void (*_g_reserved10) (void);
void (*_g_reserved11) (void);
void (*_g_reserved12) (void);
void (*_g_reserved13) (void);
void (*_g_reserved14) (void);
void (*_g_reserved15) (void);
void (*_g_reserved16) (void);
gpointer padding[16];
};
struct _GDBusAuthMechanism
......
......@@ -50,22 +50,7 @@ struct _GDBusAuthMechanismAnonClass
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
void (*_g_reserved9) (void);
void (*_g_reserved10) (void);
void (*_g_reserved11) (void);
void (*_g_reserved12) (void);
void (*_g_reserved13) (void);
void (*_g_reserved14) (void);
void (*_g_reserved15) (void);
void (*_g_reserved16) (void);
gpointer padding[16];
};
struct _GDBusAuthMechanismAnon
......
......@@ -50,22 +50,7 @@ struct _GDBusAuthMechanismExternalClass
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
void (*_g_reserved9) (void);
void (*_g_reserved10) (void);
void (*_g_reserved11) (void);
void (*_g_reserved12) (void);
void (*_g_reserved13) (void);
void (*_g_reserved14) (void);
void (*_g_reserved15) (void);
void (*_g_reserved16) (void);
gpointer padding[16];
};
struct _GDBusAuthMechanismExternal
......
......@@ -50,22 +50,7 @@ struct _GDBusAuthMechanismSha1Class
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
void (*_g_reserved9) (void);
void (*_g_reserved10) (void);
void (*_g_reserved11) (void);
void (*_g_reserved12) (void);
void (*_g_reserved13) (void);
void (*_g_reserved14) (void);
void (*_g_reserved15) (void);
void (*_g_reserved16) (void);
gpointer padding[16];
};
struct _GDBusAuthMechanismSha1
......
......@@ -65,22 +65,7 @@ struct _GDBusAuthObserverClass
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
void (*_g_reserved9) (void);
void (*_g_reserved10) (void);
void (*_g_reserved11) (void);
void (*_g_reserved12) (void);
void (*_g_reserved13) (void);
void (*_g_reserved14) (void);
void (*_g_reserved15) (void);
void (*_g_reserved16) (void);
gpointer padding[32];
};
/**
......
......@@ -77,14 +77,7 @@ struct _GDBusConnectionClass
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
gpointer padding[64];
};
GType g_dbus_connection_get_type (void) G_GNUC_CONST;
......@@ -304,14 +297,7 @@ struct _GDBusInterfaceVTable
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
gpointer padding[8];
};
guint g_dbus_connection_register_object (GDBusConnection *connection,
......
......@@ -52,6 +52,10 @@ struct _GDBusMessageClass
{
/*< private >*/
GObjectClass parent_class;
/*< private >*/
/* Padding for future expansion */
gpointer padding[32];
};
/**
......
......@@ -70,14 +70,7 @@ struct _GDBusMethodInvocationClass
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
gpointer padding[32];
};
GType g_dbus_method_invocation_get_type (void) G_GNUC_CONST;
......
......@@ -83,14 +83,7 @@ struct _GDBusProxyClass
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
gpointer padding[32];
};
GType g_dbus_proxy_get_type (void) G_GNUC_CONST;
......
......@@ -76,14 +76,7 @@ struct _GDBusServerClass
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
gpointer padding[16];
};
GType g_dbus_server_get_type (void) G_GNUC_CONST;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment