mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

gobject: Use G_ADD_PRIVATE

Browse Source 
Deprecation warnings include:

src/optargs-xfs_growfs.c: In function 'guestfs_xfs_growfs_init':
src/optargs-xfs_growfs.c:311:13: warning: Deprecated pre-processor symbol: replace with "G_ADD_PRIVATE"
  311 |   o->priv = GUESTFS_XFS_GROWFS_GET_PRIVATE (o);
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This is based on the same change made here:

https://github.com/nzjrs/osm-gps-map/pull/78/files
This commit is contained in:
Richard W.M. Jones
2022-10-24 11:19:49 +01:00
parent 001683e885
commit 19c40e6717
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
generator/GObject.ml
View File

@@ -339,10 +339,6 @@ let generate_gobject_optargs_source filename name optargs f () =
pr "\n";
pr "#include <string.h>\n\n";
pr "#define GUESTFS_%s_GET_PRIVATE(obj) " uc_name;
pr "(G_TYPE_INSTANCE_GET_PRIVATE ((obj), %s, %sPrivate))\n\n"
type_define camel_name;
pr "struct _%sPrivate {\n" camel_name;
List.iter (
function
@@ -354,7 +350,9 @@ let generate_gobject_optargs_source filename name optargs f () =
) optargs;
pr "};\n\n";
pr "G_DEFINE_TYPE (%s, guestfs_%s, G_TYPE_OBJECT);\n\n" camel_name name;
pr "G_DEFINE_TYPE_WITH_CODE (%s, guestfs_%s, G_TYPE_OBJECT,\n"
camel_name name;
pr " G_ADD_PRIVATE (%s));\n\n" camel_name;
pr "enum {\n";
pr " PROP_GUESTFS_%s_PROP0" uc_name;
@@ -495,12 +493,11 @@ let generate_gobject_optargs_source filename name optargs f () =
) optargs;
pr " object_class->finalize = guestfs_%s_finalize;\n" name;
pr " g_type_class_add_private (klass, sizeof (%sPrivate));\n" camel_name;
pr "}\n\n";
pr "static void\nguestfs_%s_init (%s *o)\n" name camel_name;
pr "{\n";
pr " o->priv = GUESTFS_%s_GET_PRIVATE (o);\n" uc_name;
pr " o->priv = guestfs_%s_get_instance_private (o);\n" name;
pr " /* XXX: Find out if gobject already zeroes private structs */\n";
pr " memset (o->priv, 0, sizeof (%sPrivate));\n" camel_name;
pr "}\n\n";
@@ -821,18 +818,14 @@ guestfs_session_event_get_type (void)
/* GuestfsSession */
#define GUESTFS_SESSION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(obj), \
GUESTFS_TYPE_SESSION, \
GuestfsSessionPrivate))
struct _GuestfsSessionPrivate
{
guestfs_h *g;
int event_handle;
};
G_DEFINE_TYPE (GuestfsSession, guestfs_session, G_TYPE_OBJECT);
G_DEFINE_TYPE_WITH_CODE (GuestfsSession, guestfs_session, G_TYPE_OBJECT,
G_ADD_PRIVATE (GuestfsSession));
static void
guestfs_session_finalize (GObject *object)
@@ -850,9 +843,7 @@ guestfs_session_class_init (GuestfsSessionClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = guestfs_session_finalize;
g_type_class_add_private (klass, sizeof (GuestfsSessionPrivate));";
object_class->finalize = guestfs_session_finalize;";
List.iter (
fun (name, _) ->
@@ -883,7 +874,7 @@ guestfs_session_class_init (GuestfsSessionClass *klass)
static void
guestfs_session_init (GuestfsSession *session)
{
session->priv = GUESTFS_SESSION_GET_PRIVATE (session);
session->priv = guestfs_session_get_instance_private (session);
session->priv->g = guestfs_create ();
guestfs_h *g = session->priv->g;