From b934976024ef4e1694ec47158d94bce0f6d003b7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 23 Jun 2023 03:15:55 +0900 Subject: [PATCH] Prefer `0` over `NULL` as function pointers SunC warns use of `NULL`, pointer to data as function pointers. --- class.c | 2 +- internal/class.h | 2 +- ractor.c | 2 +- struct.c | 2 +- time.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/class.c b/class.c index 9608e9b41a..de9bb3f822 100644 --- a/class.c +++ b/class.c @@ -249,7 +249,7 @@ class_alloc(VALUE flags, VALUE klass) */ RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj); RB_OBJ_WRITE(obj, &RCLASS_REFINED_CLASS(obj), Qnil); - RCLASS_SET_ALLOCATOR((VALUE)obj, NULL); + RCLASS_SET_ALLOCATOR((VALUE)obj, 0); return (VALUE)obj; } diff --git a/internal/class.h b/internal/class.h index 146123005e..b9ff53a6b0 100644 --- a/internal/class.h +++ b/internal/class.h @@ -148,7 +148,7 @@ static inline rb_alloc_func_t RCLASS_ALLOCATOR(VALUE klass) { if (FL_TEST_RAW(klass, FL_SINGLETON)) { - return NULL; + return 0; } return RCLASS_EXT(klass)->as.class.allocator; } diff --git a/ractor.c b/ractor.c index 77acf3a97f..d6756699cf 100644 --- a/ractor.c +++ b/ractor.c @@ -648,7 +648,7 @@ ractor_sleep_with_cleanup(rb_execution_context_t *ec, rb_ractor_t *cr, enum rb_r static enum rb_ractor_wakeup_status ractor_sleep(rb_execution_context_t *ec, rb_ractor_t *cr, enum rb_ractor_wait_status wait_status) { - return ractor_sleep_with_cleanup(ec, cr, wait_status, NULL, NULL); + return ractor_sleep_with_cleanup(ec, cr, wait_status, 0, NULL); } // Ractor.receive diff --git a/struct.c b/struct.c index 7214402f59..93053f0ad5 100644 --- a/struct.c +++ b/struct.c @@ -1871,7 +1871,7 @@ rb_data_with(int argc, const VALUE *argv, VALUE self) } VALUE h = rb_struct_to_h(self); - rb_hash_update_by(h, kwargs, NULL); + rb_hash_update_by(h, kwargs, 0); return rb_class_new_instance_kw(1, &h, rb_obj_class(self), TRUE); } diff --git a/time.c b/time.c index 4dbdd3cf7d..d3eb4be682 100644 --- a/time.c +++ b/time.c @@ -5828,7 +5828,7 @@ Init_Time(void) if (debug_find_time_numguess) { rb_define_hooked_variable("$find_time_numguess", (VALUE *)&find_time_numguess, - find_time_numguess_getter, NULL); + find_time_numguess_getter, 0); } rb_cTimeTM = Init_tm(rb_cTime, "tm");