From 30d72056711dc80249a428a9dd5714254d7e3119 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 12 May 2023 10:49:25 +0900 Subject: Add `rb_sys_fail_sprintf` macro --- hash.c | 8 ++++---- internal/error.h | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hash.c b/hash.c index 770c4aef8f..213bba01bf 100644 --- a/hash.c +++ b/hash.c @@ -5210,7 +5210,7 @@ ruby_setenv(const char *name, const char *value) } ENV_UNLOCK(); - if (ret) rb_sys_fail_str(rb_sprintf("setenv(%s)", name)); + if (ret) rb_sys_fail_sprintf("setenv(%s)", name); } else { #ifdef VOID_UNSETENV @@ -5227,7 +5227,7 @@ ruby_setenv(const char *name, const char *value) } ENV_UNLOCK(); - if (ret) rb_sys_fail_str(rb_sprintf("unsetenv(%s)", name)); + if (ret) rb_sys_fail_sprintf("unsetenv(%s)", name); #endif } #elif defined __sun @@ -5244,7 +5244,7 @@ ruby_setenv(const char *name, const char *value) mem_size = len + strlen(value) + 2; mem_ptr = malloc(mem_size); if (mem_ptr == NULL) - rb_sys_fail_str(rb_sprintf("malloc(%"PRIuSIZE")", mem_size)); + rb_sys_fail_sprintf("malloc(%"PRIuSIZE")", mem_size); snprintf(mem_ptr, mem_size, "%s=%s", name, value); } @@ -5270,7 +5270,7 @@ ruby_setenv(const char *name, const char *value) if (ret) { free(mem_ptr); - rb_sys_fail_str(rb_sprintf("putenv(%s)", name)); + rb_sys_fail_sprintf("putenv(%s)", name); } } #else /* WIN32 */ diff --git a/internal/error.h b/internal/error.h index bbb37e0443..5fee468929 100644 --- a/internal/error.h +++ b/internal/error.h @@ -54,6 +54,12 @@ do { \ rb_syserr_fail_path(errno_to_fail, (path)); \ } while (0) +#define rb_sys_fail_sprintf(...) \ +do { \ + int errno_to_fail = errno; \ + rb_syserr_fail_str(errno_to_fail, rb_sprintf("" __VA_ARGS__)); \ +} while (0) + /* error.c */ extern long rb_backtrace_length_limit; extern VALUE rb_eEAGAIN; -- cgit v1.2.1