1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix function pointer type mismatch with rb_define_private_method

Browse Source 
`rb_define_private_method` performs strict type checking on the function
pointer. As a result, we cannot pass the function a generic signature.

```
  /github/workspace/src/namespace.c:1097:72: note: expected 'VALUE (*)(void)' {aka 'long unsigned int (*)(void)'} but argument is of type 'VALUE (*)(int,  VALUE *, VALUE)' {aka 'long unsigned int (*)(int,  long unsigned int *, long unsigned int)'}
   1097 | namespace_define_loader_method(VALUE module, const char *name, VALUE (*func)(ANYARGS), int argc)
        |                                                                ~~~~~~~~^~~~~~~~~~~~~~
```

This commit defines the method directly to avoid the mismatch error.
This commit is contained in:
Yusuke Endoh 2025-05-01 18:36:24 +09:00 committed by Satoshi Tagomori
parent cf3e2bbad2
commit 4b33b468ac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
namespace.c
View File

@ -1094,10 +1094,10 @@ setup_pushing_loading_namespace(rb_namespace_t *ns)
}
static void
namespace_define_loader_method(VALUE module, const char *name, VALUE (*func)(ANYARGS), int argc)
namespace_define_loader_method(const char *name)
{
rb_define_private_method(module, name, func, argc);
rb_define_singleton_method(module, name, func, argc);
rb_define_private_method(rb_mNamespaceLoader, name, rb_namespace_user_loading_func, -1);
rb_define_singleton_method(rb_mNamespaceLoader, name, rb_namespace_user_loading_func, -1);
}
void
@ -1118,9 +1118,9 @@ Init_Namespace(void)
}
rb_mNamespaceLoader = rb_define_module_under(rb_cNamespace, "Loader");
namespace_define_loader_method(rb_mNamespaceLoader, "require", rb_namespace_user_loading_func, -1);
namespace_define_loader_method(rb_mNamespaceLoader, "require_relative", rb_namespace_user_loading_func, -1);
namespace_define_loader_method(rb_mNamespaceLoader, "load", rb_namespace_user_loading_func, -1);
namespace_define_loader_method("require");
namespace_define_loader_method("require_relative");
namespace_define_loader_method("load");
rb_define_singleton_method(rb_cNamespace, "enabled?", rb_namespace_s_getenabled, 0);
rb_define_singleton_method(rb_cNamespace, "current", rb_namespace_current, 0);