aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-02 01:57:27 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-02 01:57:27 +0000
commiteda59a31aa957f163fcc012ae682b5b5ab3e7c97 (patch)
tree8d976b9fbe60804f00d2c221af95f66728afe8d5
parent5dd8d5da1625cc29d3e82345b4fb34a0c2ad9b02 (diff)
downloadruby-eda59a31aa957f163fcc012ae682b5b5ab3e7c97.tar.gz
use `ra` instead of new variables.
* file.c (rb_file_s_rename): `struct rename_args ra` already has members which contain C ptrs. Pointed by MSP-Greg. Thanks! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--file.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/file.c b/file.c
index d2b9cc4ca5..47e22453c1 100644
--- a/file.c
+++ b/file.c
@@ -2915,13 +2915,11 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
RUBY_UBF_IO, 0) < 0) {
int e = errno;
#if defined DOSISH
- const char *src = StringValueCStr(f);
- const char *dst = StringValueCStr(t);
switch (e) {
case EEXIST:
- if (chmod(dst, 0666) == 0 &&
- unlink(dst) == 0 &&
- rename(src, dst) == 0)
+ if (chmod(ra.dst, 0666) == 0 &&
+ unlink(ra.dst) == 0 &&
+ rename(ra.src, ra.dst) == 0)
return INT2FIX(0);
}
#endif