Using is_broken_string function

S-H-GAMELINKS · nobu · commit 79f50b9d02b2 · 2022-09-10T09:32:51.000+09:00
diff --git a/file.c b/file.c
@@ -4500,9 +4500,9 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, rb_encoding *origenc, enum
         rb_enc_associate(resolved, origenc);
     }
 
-    if (rb_enc_str_coderange(resolved) == ENC_CODERANGE_BROKEN) {
+    if (is_broken_string(resolved)) {
         rb_enc_associate(resolved, rb_filesystem_encoding());
-        if (rb_enc_str_coderange(resolved) == ENC_CODERANGE_BROKEN) {
+        if (is_broken_string(resolved)) {
             rb_enc_associate(resolved, rb_ascii8bit_encoding());
         }
     }
diff --git a/marshal.c b/marshal.c
@@ -1554,7 +1554,7 @@ r_symreal(struct load_arg *arg, int ivar)
     }
     if (idx > 0) {
         rb_enc_associate_index(s, idx);
-        if (rb_enc_str_coderange(s) == ENC_CODERANGE_BROKEN) {
+        if (is_broken_string(s)) {
             rb_raise(rb_eArgError, "invalid byte sequence in %s: %+"PRIsVALUE,
                      rb_enc_name(rb_enc_from_index(idx)), s);
         }
diff --git a/transcode.c b/transcode.c
@@ -2590,7 +2590,7 @@ rb_econv_prepare_options(VALUE opthash, VALUE *opts, int ecflags)
     v = rb_hash_aref(opthash, sym_replace);
     if (!NIL_P(v)) {
         StringValue(v);
-        if (rb_enc_str_coderange(v) == ENC_CODERANGE_BROKEN) {
+        if (is_broken_string(v)) {
             VALUE dumped = rb_str_dump(v);
             rb_raise(rb_eArgError, "replacement string is broken: %s as %s",
                      StringValueCStr(dumped),

Original file line number	Diff line number	Diff line change
`@@ -4500,9 +4500,9 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, rb_encoding *origenc, enum`
`4500`	`4500`	`rb_enc_associate(resolved, origenc);`
`4501`	`4501`	`}`
`4502`	`4502`
`4503`		`- if (rb_enc_str_coderange(resolved) == ENC_CODERANGE_BROKEN) {`
	`4503`	`+ if (is_broken_string(resolved)) {`
`4504`	`4504`	`rb_enc_associate(resolved, rb_filesystem_encoding());`
`4505`		`- if (rb_enc_str_coderange(resolved) == ENC_CODERANGE_BROKEN) {`
	`4505`	`+ if (is_broken_string(resolved)) {`
`4506`	`4506`	`rb_enc_associate(resolved, rb_ascii8bit_encoding());`
`4507`	`4507`	`}`
`4508`	`4508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1554,7 +1554,7 @@ r_symreal(struct load_arg *arg, int ivar)`
`1554`	`1554`	`}`
`1555`	`1555`	`if (idx > 0) {`
`1556`	`1556`	`rb_enc_associate_index(s, idx);`
`1557`		`- if (rb_enc_str_coderange(s) == ENC_CODERANGE_BROKEN) {`
	`1557`	`+ if (is_broken_string(s)) {`
`1558`	`1558`	`rb_raise(rb_eArgError, "invalid byte sequence in %s: %+"PRIsVALUE,`
`1559`	`1559`	`rb_enc_name(rb_enc_from_index(idx)), s);`
`1560`	`1560`	`}`