diff options
| -rw-r--r-- | .git-blame-ignore-revs | 1 | ||||
| -rw-r--r-- | string.c | 34 |
2 files changed, 17 insertions, 18 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 665ac96a8c..1eed0e2b5f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -14,7 +14,6 @@ d1474affa8e105bece209cc9d594bb0a989859e1 # Indentation 0e4bad888e605d424b9222ae0ca43f85c1634e5e -61aa46c41648c6d1e9b0daa1a292de551fde78df # Enable Style/StringLiterals cop for RubyGems/Bundler d7ffd3fea402239b16833cc434404a7af82d44f3 @@ -11124,48 +11124,48 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag) rlen = n - llen; cr = ENC_CODERANGE(str); if (flen > 1) { - llen2 = str_offset(f, f + flen, llen % fclen, enc, singlebyte); - rlen2 = str_offset(f, f + flen, rlen % fclen, enc, singlebyte); + llen2 = str_offset(f, f + flen, llen % fclen, enc, singlebyte); + rlen2 = str_offset(f, f + flen, rlen % fclen, enc, singlebyte); } size = RSTRING_LEN(str); if ((len = llen / fclen + rlen / fclen) >= LONG_MAX / flen || - (len *= flen) >= LONG_MAX - llen2 - rlen2 || - (len += llen2 + rlen2) >= LONG_MAX - size) { - rb_raise(rb_eArgError, "argument too big"); + (len *= flen) >= LONG_MAX - llen2 - rlen2 || + (len += llen2 + rlen2) >= LONG_MAX - size) { + rb_raise(rb_eArgError, "argument too big"); } len += size; res = str_enc_new(rb_cString, 0, len, enc); p = RSTRING_PTR(res); if (flen <= 1) { - memset(p, *f, llen); - p += llen; + memset(p, *f, llen); + p += llen; } else { - while (llen >= fclen) { + while (llen >= fclen) { memcpy(p,f,flen); p += flen; llen -= fclen; } - if (llen > 0) { - memcpy(p, f, llen2); - p += llen2; + if (llen > 0) { + memcpy(p, f, llen2); + p += llen2; } } memcpy(p, RSTRING_PTR(str), size); p += size; if (flen <= 1) { - memset(p, *f, rlen); - p += rlen; + memset(p, *f, rlen); + p += rlen; } else { - while (rlen >= fclen) { + while (rlen >= fclen) { memcpy(p,f,flen); p += flen; rlen -= fclen; } - if (rlen > 0) { - memcpy(p, f, rlen2); - p += rlen2; + if (rlen > 0) { + memcpy(p, f, rlen2); + p += rlen2; } } TERM_FILL(p, termlen); |