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

ruby: fix deprecation warnings

Browse Source 
Convert to TypedData_Get_Struct which has been in ruby since 2009

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
2025-10-20 12:41:55 -04:00
parent a497a24ecf
commit 967587b061
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generator/ruby.ml
View File

@@ -76,6 +76,8 @@ extern VALUE m_guestfs; /* guestfs module */
extern VALUE c_guestfs; /* guestfs_h handle */ extern VALUE c_guestfs; /* guestfs_h handle */
extern VALUE e_Error; /* used for all errors */ extern VALUE e_Error; /* used for all errors */
extern const rb_data_type_t guestfs_h_data_type; /* TypedData structure */
extern VALUE guestfs_int_ruby_alloc_handle (VALUE klass); extern VALUE guestfs_int_ruby_alloc_handle (VALUE klass);
extern VALUE guestfs_int_ruby_initialize_handle (int argc, VALUE *argv, VALUE m); extern VALUE guestfs_int_ruby_initialize_handle (int argc, VALUE *argv, VALUE m);
extern VALUE guestfs_int_ruby_compat_create_handle (int argc, VALUE *argv, VALUE module); extern VALUE guestfs_int_ruby_compat_create_handle (int argc, VALUE *argv, VALUE module);
@@ -224,7 +226,7 @@ and generate_ruby_c actions () =
pr ")\n"; pr ")\n";
pr "{\n"; pr "{\n";
pr " guestfs_h *g;\n"; pr " guestfs_h *g;\n";
pr " Data_Get_Struct (gv, guestfs_h, g);\n"; pr " TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);\n";
pr " if (!g)\n"; pr " if (!g)\n";
pr " rb_raise (rb_eArgError, \"%%s: used handle after closing it\", \"%s\");\n" pr " rb_raise (rb_eArgError, \"%%s: used handle after closing it\", \"%s\");\n"
f.name; f.name;

19
ruby/ext/guestfs/handle.c
View File

@@ -75,6 +75,15 @@ free_handle (void *gvp)
} }
} }
/* TypedData structure for guestfs handle. */
const rb_data_type_t guestfs_h_data_type = {
.wrap_struct_name = "guestfs_h",
.function = {
.dfree = free_handle,
},
.flags = RUBY_TYPED_FREE_IMMEDIATELY
};
/* This is the ruby internal alloc function for the class. We do nothing /* This is the ruby internal alloc function for the class. We do nothing
* here except allocate an object containing a NULL guestfs handle. * here except allocate an object containing a NULL guestfs handle.
* Note we cannot call guestfs_create here because we need the extra * Note we cannot call guestfs_create here because we need the extra
@@ -89,7 +98,7 @@ guestfs_int_ruby_alloc_handle (VALUE klass)
/* Wrap it, and make sure the close function is called when the /* Wrap it, and make sure the close function is called when the
* handle goes away. * handle goes away.
*/ */
return Data_Wrap_Struct (c_guestfs, NULL, free_handle, g); return TypedData_Wrap_Struct (c_guestfs, &guestfs_h_data_type, g);
} }
static unsigned static unsigned
@@ -166,7 +175,7 @@ guestfs_int_ruby_compat_create_handle (int argc, VALUE *argv, VALUE module)
/* Don't print error messages to stderr by default. */ /* Don't print error messages to stderr by default. */
guestfs_set_error_handler (g, NULL, NULL); guestfs_set_error_handler (g, NULL, NULL);
return Data_Wrap_Struct (c_guestfs, NULL, free_handle, g); return TypedData_Wrap_Struct (c_guestfs, &guestfs_h_data_type, g);
} }
/* /*
@@ -181,7 +190,7 @@ VALUE
guestfs_int_ruby_close_handle (VALUE gv) guestfs_int_ruby_close_handle (VALUE gv)
{ {
guestfs_h *g; guestfs_h *g;
Data_Get_Struct (gv, guestfs_h, g); TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);
/* Clear the data pointer first so there's no chance of a double /* Clear the data pointer first so there's no chance of a double
* close if a close callback does something bad like calling exit. * close if a close callback does something bad like calling exit.
@@ -209,7 +218,7 @@ guestfs_int_ruby_set_event_callback (VALUE gv, VALUE cbv, VALUE event_bitmaskv)
VALUE *root; VALUE *root;
char key[64]; char key[64];
Data_Get_Struct (gv, guestfs_h, g); TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);
event_bitmask = NUM2ULL (event_bitmaskv); event_bitmask = NUM2ULL (event_bitmaskv);
@@ -249,7 +258,7 @@ guestfs_int_ruby_delete_event_callback (VALUE gv, VALUE event_handlev)
const int eh = NUM2INT (event_handlev); const int eh = NUM2INT (event_handlev);
VALUE *root; VALUE *root;
Data_Get_Struct (gv, guestfs_h, g); TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);
snprintf (key, sizeof key, "_ruby_event_%d", eh); snprintf (key, sizeof key, "_ruby_event_%d", eh);