diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-06-17 14:59:44 +0900 |
---|---|---|
committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-06-29 11:05:41 +0900 |
commit | 6df790f22ed48c9998c12dc5eaccf9d13e545185 (patch) | |
tree | 028435fd0614040fc508add43355a193a2e8384f /string.c | |
parent | 31a770ac4827b6c9404d9506d234c23fd00da0f4 (diff) | |
download | ruby-6df790f22ed48c9998c12dc5eaccf9d13e545185.tar.gz |
rb_enc_cr_str_buf_cat: do not goto into a branch
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea. Better refactor.
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -2975,9 +2975,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, ptr_cr != ENC_CODERANGE_7BIT) { str_enc = rb_enc_from_index(str_encindex); ptr_enc = rb_enc_from_index(ptr_encindex); - incompatible: - rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s", - rb_enc_name(str_enc), rb_enc_name(ptr_enc)); + goto incompatible; } if (str_cr == ENC_CODERANGE_UNKNOWN) { @@ -3013,6 +3011,10 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, str_buf_cat(str, ptr, len); ENCODING_CODERANGE_SET(str, res_encindex, res_cr); return str; + + incompatible: + rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s", + rb_enc_name(str_enc), rb_enc_name(ptr_enc)); } VALUE |