summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2026-05-16 10:59:38 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2026-05-16 10:59:38 +0900
commit7480cd8d37fd71a41ce12b759090051c7e14fb5a (patch)
treeb631d8d1f14dac774652fd6db22d76755d23bb59
parentf315ca67eea90a1a6806ac1673ece7c37217169e (diff)
Revert "[DOC] Remove unnecessary require" [ci skip]
This reverts commit bf01f6ae89a95d8f5572e050facfe311c8c28aaf, that was an accidental commit by mistake.
-rw-r--r--.git-blame-ignore-revs2
-rw-r--r--string.c34
2 files changed, 19 insertions, 17 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 1eed0e2b5f..6cd54e8198 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -14,6 +14,7 @@ d1474affa8e105bece209cc9d594bb0a989859e1
# Indentation
0e4bad888e605d424b9222ae0ca43f85c1634e5e
+61aa46c41648c6d1e9b0daa1a292de551fde78df
# Enable Style/StringLiterals cop for RubyGems/Bundler
d7ffd3fea402239b16833cc434404a7af82d44f3
@@ -42,6 +43,7 @@ d4e24021d39e1f80f0055b55d91f8d5f22e15084
e90282be7ba1bc8e3119f6e1a2c80356ceb3f80a
26a9e0b4e31f7b5a9cbd755e0a15823a8fa51bae
2f53985da9ee593fe524d408256835667938c7d7
+bf01f6ae89a95d8f5572e050facfe311c8c28aaf
# Win32: EOL code of batch files
23f9a0d655c4d405bb2397a147a1523436205486
diff --git a/string.c b/string.c
index c72e2a8e36..eb249662db 100644
--- a/string.c
+++ b/string.c
@@ -11122,48 +11122,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);