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

check_exec_redirect: do not goto into a branch

Browse Source 
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
This commit is contained in:
卜部昌平 2020-06-16 12:53:24 +09:00
parent 9298631316
commit 08202d1f0e
Notes: git 2020-06-29 11:06:53 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
process.c
View File

@ -1934,7 +1934,7 @@ check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
switch (TYPE(val)) { switch (TYPE(val)) {
case T_SYMBOL: case T_SYMBOL:
if (!(id = rb_check_id(&val))) goto wrong_symbol; id = rb_check_id(&val);
if (id == id_close) { if (id == id_close) {
param = Qnil; param = Qnil;
eargp->fd_close = check_exec_redirect1(eargp->fd_close, key, param); eargp->fd_close = check_exec_redirect1(eargp->fd_close, key, param);
@ -1952,7 +1952,6 @@ check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
eargp->fd_dup2 = check_exec_redirect1(eargp->fd_dup2, key, param); eargp->fd_dup2 = check_exec_redirect1(eargp->fd_dup2, key, param);
} }
else { else {
wrong_symbol:
rb_raise(rb_eArgError, "wrong exec redirect symbol: %"PRIsVALUE, rb_raise(rb_eArgError, "wrong exec redirect symbol: %"PRIsVALUE,
val); val);
} }