From 012f297311817ecb19f78c55854b033bb4b0397c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 11 Jan 2020 16:32:56 +0900 Subject: Get rid of use of magic number 'E' --- marshal.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index 299902712c..532627118e 100644 --- a/marshal.c +++ b/marshal.c @@ -585,7 +585,7 @@ w_obj_each(st_data_t key, st_data_t val, st_data_t a) if (to_be_skipped_id(id)) { if (id == s_encoding_short) { - rb_warn("instance variable `E' on class %"PRIsVALUE" is not dumped", + rb_warn("instance variable `"name_s_encoding_short"' on class %"PRIsVALUE" is not dumped", CLASS_OF(arg->obj)); } return ST_CONTINUE; @@ -1371,6 +1371,13 @@ r_bytes0(long len, struct load_arg *arg) return str; } +static inline int +name_equal(const char *name, size_t nlen, const char *p, long l) +{ + if ((size_t)l != nlen || *p != *name) return 0; + return nlen == 1 || memcmp(p+1, name+1, nlen-1) == 0; +} + static int sym2encidx(VALUE sym, VALUE val) { @@ -1380,12 +1387,11 @@ sym2encidx(VALUE sym, VALUE val) if (rb_enc_get_index(sym) != ENCINDEX_US_ASCII) return -1; RSTRING_GETMEM(sym, p, l); if (l <= 0) return -1; - if (l == sizeof(name_encoding) && - memcmp(p, name_encoding, sizeof(name_encoding)) == 0) { + if (name_equal(name_encoding, sizeof(name_encoding), p, l)) { int idx = rb_enc_find_index(StringValueCStr(val)); return idx; } - else if (l == 1 && *p == 'E') { + if (name_equal(name_s_encoding_short, rb_strlen_lit(name_s_encoding_short), p, l)) { if (val == Qfalse) return rb_usascii_encindex(); else if (val == Qtrue) return rb_utf8_encindex(); /* bogus ignore */ -- cgit v1.2.3