From dedf9f5f621f4f9b72b3b40be1753791b7de974e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 16 Jul 2025 17:44:04 +0900 Subject: [PATCH] Suppress gcc 15 unterminated-string-initialization warnings --- common.mk | 1 + file.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 2085401ff2..0332d24da3 100644 --- a/common.mk +++ b/common.mk @@ -7436,6 +7436,7 @@ file.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h file.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h file.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h file.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h +file.$(OBJEXT): {$(VPATH)}internal/attr/nonstring.h file.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h file.$(OBJEXT): {$(VPATH)}internal/attr/packed_struct.h file.$(OBJEXT): {$(VPATH)}internal/attr/pure.h diff --git a/file.c b/file.c index 936e0cdb95..3d8c800429 100644 --- a/file.c +++ b/file.c @@ -12,6 +12,7 @@ **********************************************************************/ #include "ruby/internal/config.h" +#include "ruby/internal/attr/nonstring.h" #ifdef _WIN32 # include "missing/file.h" @@ -373,7 +374,7 @@ rb_str_normalize_ospath(const char *ptr, long len) int r = rb_enc_precise_mbclen(p, e, enc); if (!MBCLEN_CHARFOUND_P(r)) { /* invalid byte shall not happen but */ - static const char invalid[3] = "\xEF\xBF\xBD"; + RBIMPL_ATTR_NONSTRING() static const char invalid[3] = "\xEF\xBF\xBD"; rb_str_append_normalized_ospath(str, p1, p-p1); rb_str_cat(str, invalid, sizeof(invalid)); p += 1;