summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-24 15:46:01 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-24 15:46:01 +0000
commitbcef849df94fc48bd9c99472303f2fb7cf251f17 (patch)
treee231cc9e567c590493b278f8657c7c8e48d0f3eb /process.c
parentad5757276d48761ff9e071991d3957f75ce2d4b4 (diff)
merge revision(s) 40829:
fix typos inspired by r40825 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/process.c b/process.c
index 0f758e831c..d351a398d3 100644
--- a/process.c
+++ b/process.c
@@ -3312,7 +3312,7 @@ rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
int err, state = 0;
int ep[2];
VALUE exc = Qnil;
- int error_occured;
+ int error_occurred;
if (status) *status = 0;
@@ -3354,8 +3354,8 @@ rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
#endif
}
close(ep[1]);
- error_occured = recv_child_error(ep[0], &state, &exc, &err, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
- if (state || error_occured) {
+ error_occurred = recv_child_error(ep[0], &state, &exc, &err, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
+ if (state || error_occurred) {
if (status) {
rb_protect(proc_syswait, (VALUE)pid, status);
if (state) *status = state;