summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-01 15:25:28 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-01 15:25:28 (GMT)
commit66fd9d44d87240164588b42c887b6e3d6ee99308 (patch)
treef2b2fee9d1c6f273e07c32f7f84dc5bb5d7c7ba8 /load.c
parent82b1bfe417120de96737de88f406e1b877cef5f7 (diff)
adjust style.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r--load.c44
1 files changed, 20 insertions, 24 deletions
diff --git a/load.c b/load.c
index 98a5900..f973394 100644
--- a/load.c
+++ b/load.c
@@ -623,11 +623,10 @@ rb_f_load(int argc, VALUE *argv)
rb_scan_args(argc, argv, "11", &fname, &wrap);
- if(RUBY_DTRACE_LOAD_ENTRY_ENABLED()) {
- RUBY_DTRACE_LOAD_ENTRY(
- StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
+ if (RUBY_DTRACE_LOAD_ENTRY_ENABLED()) {
+ RUBY_DTRACE_LOAD_ENTRY(StringValuePtr(fname),
+ rb_sourcefile(),
+ rb_sourceline());
}
path = rb_find_file(FilePathValue(fname));
@@ -638,8 +637,8 @@ rb_f_load(int argc, VALUE *argv)
}
rb_load_internal(path, RTEST(wrap));
- if(RUBY_DTRACE_LOAD_RETURN_ENABLED()) {
- RUBY_DTRACE_LOAD_RETURN(StringValuePtr(fname));
+ if (RUBY_DTRACE_LOAD_RETURN_ENABLED()) {
+ RUBY_DTRACE_LOAD_RETURN(StringValuePtr(fname));
}
return Qtrue;
@@ -875,11 +874,10 @@ rb_require_safe(VALUE fname, int safe)
} volatile saved;
char *volatile ftptr = 0;
- if(RUBY_DTRACE_REQUIRE_ENTRY_ENABLED()) {
- RUBY_DTRACE_REQUIRE_ENTRY(
- StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
+ if (RUBY_DTRACE_REQUIRE_ENTRY_ENABLED()) {
+ RUBY_DTRACE_REQUIRE_ENTRY(StringValuePtr(fname),
+ rb_sourcefile(),
+ rb_sourceline());
}
PUSH_TAG();
@@ -893,20 +891,18 @@ rb_require_safe(VALUE fname, int safe)
FilePathValue(fname);
rb_set_safe_level_force(0);
- if(RUBY_DTRACE_FIND_REQUIRE_ENTRY_ENABLED()) {
- RUBY_DTRACE_FIND_REQUIRE_ENTRY(
- StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
+ if (RUBY_DTRACE_FIND_REQUIRE_ENTRY_ENABLED()) {
+ RUBY_DTRACE_FIND_REQUIRE_ENTRY(StringValuePtr(fname),
+ rb_sourcefile(),
+ rb_sourceline());
}
found = search_required(fname, &path, safe);
- if(RUBY_DTRACE_FIND_REQUIRE_RETURN_ENABLED()) {
- RUBY_DTRACE_FIND_REQUIRE_RETURN(
- StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
+ if (RUBY_DTRACE_FIND_REQUIRE_RETURN_ENABLED()) {
+ RUBY_DTRACE_FIND_REQUIRE_RETURN(StringValuePtr(fname),
+ rb_sourcefile(),
+ rb_sourceline());
}
if (found) {
if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) {
@@ -943,8 +939,8 @@ rb_require_safe(VALUE fname, int safe)
th->errinfo = errinfo;
- if(RUBY_DTRACE_REQUIRE_RETURN_ENABLED()) {
- RUBY_DTRACE_REQUIRE_RETURN(StringValuePtr(fname));
+ if (RUBY_DTRACE_REQUIRE_RETURN_ENABLED()) {
+ RUBY_DTRACE_REQUIRE_RETURN(StringValuePtr(fname));
}
return result;