1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file.c: get rid of intermediate objects

Browse Source 
* file.c (rb_str_normalize_ospath): place normalized strings to
  the result string directly, to get rid of intermediate objects
  and copying.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-04 02:32:08 +00:00
parent 87a9dcf1b6
commit 5f0bb43434
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
file.c
View File

@ -259,9 +259,8 @@ rb_str_encode_ospath(VALUE path)
#ifdef __APPLE__ #ifdef __APPLE__
static VALUE static VALUE
rb_str_normalize_ospath0(const char *ptr, long len) rb_str_append_normalized_ospath(VALUE str, const char *ptr, long len)
{ {
VALUE str;
CFIndex buflen = 0; CFIndex buflen = 0;
CFRange all; CFRange all;
CFStringRef s = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, CFStringRef s = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault,
@ -269,14 +268,15 @@ rb_str_normalize_ospath0(const char *ptr, long len)
kCFStringEncodingUTF8, FALSE, kCFStringEncodingUTF8, FALSE,
kCFAllocatorNull); kCFAllocatorNull);
CFMutableStringRef m = CFStringCreateMutableCopy(kCFAllocatorDefault, len, s); CFMutableStringRef m = CFStringCreateMutableCopy(kCFAllocatorDefault, len, s);
long oldlen = RSTRING_LEN(str);
CFStringNormalize(m, kCFStringNormalizationFormC); CFStringNormalize(m, kCFStringNormalizationFormC);
all = CFRangeMake(0, CFStringGetLength(m)); all = CFRangeMake(0, CFStringGetLength(m));
CFStringGetBytes(m, all, kCFStringEncodingUTF8, '?', FALSE, NULL, 0, &buflen); CFStringGetBytes(m, all, kCFStringEncodingUTF8, '?', FALSE, NULL, 0, &buflen);
str = rb_enc_str_new(0, buflen, rb_utf8_encoding()); rb_str_modify_expand(str, buflen);
CFStringGetBytes(m, all, kCFStringEncodingUTF8, '?', FALSE, (UInt8 *)RSTRING_PTR(str), CFStringGetBytes(m, all, kCFStringEncodingUTF8, '?', FALSE,
buflen, &buflen); (UInt8 *)(RSTRING_PTR(str) + oldlen), buflen, &buflen);
rb_str_set_len(str, buflen); rb_str_set_len(str, oldlen + buflen);
CFRelease(m); CFRelease(m);
CFRelease(s); CFRelease(s);
return str; return str;
@ -297,8 +297,9 @@ rb_str_normalize_ospath(const char *ptr, long len)
int r = rb_enc_precise_mbclen(p, e, enc); int r = rb_enc_precise_mbclen(p, e, enc);
if (!MBCLEN_CHARFOUND_P(r)) { if (!MBCLEN_CHARFOUND_P(r)) {
/* invalid byte shall not happen but */ /* invalid byte shall not happen but */
rb_str_append(str, rb_str_normalize_ospath0(p1, p-p1)); static const char invalid[3] = "\xEF\xBF\xBD";
rb_str_cat2(str, "\xEF\xBF\xBD"); rb_str_append_normalized_ospath(str, p1, p-p1);
rb_str_cat(str, invalid, sizeof(invalid));
p += 1; p += 1;
p1 = p; p1 = p;
continue; continue;
@ -308,7 +309,7 @@ rb_str_normalize_ospath(const char *ptr, long len)
if ((0x2000 <= c && c <= 0x2FFF) || (0xF900 <= c && c <= 0xFAFF) || if ((0x2000 <= c && c <= 0x2FFF) || (0xF900 <= c && c <= 0xFAFF) ||
(0x2F800 <= c && c <= 0x2FAFF)) { (0x2F800 <= c && c <= 0x2FAFF)) {
if (p - p1 > 0) { if (p - p1 > 0) {
rb_str_append(str, rb_str_normalize_ospath0(p1, p-p1)); rb_str_append_normalized_ospath(str, p1, p-p1);
} }
rb_str_cat(str, p, l); rb_str_cat(str, p, l);
p += l; p += l;
@ -319,7 +320,7 @@ rb_str_normalize_ospath(const char *ptr, long len)
} }
} }
if (p - p1 > 0) { if (p - p1 > 0) {
rb_str_append(str, rb_str_normalize_ospath0(p1, p-p1)); rb_str_append_normalized_ospath(str, p1, p-p1);
} }
return str; return str;