summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-07 03:26:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-07 03:26:30 +0000
commit72de92d1f9f7ad5861f151f972db085cdf3e0edb (patch)
treebba75ce2e5907ca0c425d1e2421cbbc9d2b65a50 /ruby.c
parent293249fba4c149e690c28c1ee41f9056173682a6 (diff)
rb_load_fail
* error.c (rb_load_fail): use path as a string, not char*. * internal.h: (rb_load_fail): moved from ruby/intern.h. * ruby.c (load_file_internal): fname cannot be NULL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ruby.c b/ruby.c
index 16e66c8f9c..c0e3b030e2 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1509,8 +1509,6 @@ load_file_internal(VALUE arg)
ID set_encoding;
int xflag = 0;
- if (!fname)
- rb_load_fail(fname);
if (strcmp(fname, "-") == 0) {
f = rb_stdin;
}
@@ -1526,7 +1524,7 @@ load_file_internal(VALUE arg)
}
#endif
if ((fd = rb_cloexec_open(fname, mode, 0)) < 0) {
- rb_load_fail(fname);
+ rb_load_fail(fname_v);
}
rb_update_max_fd(fd);