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

rb_int_parse_cstr: 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-11 12:56:05 +09:00
parent 5a7c0dd038
commit 184f0ab4c9
Notes: git 2020-06-29 11:07:15 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bignum.c
View File

@ -4094,10 +4094,7 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
} while (0) } while (0)
if (!str) { if (!str) {
bad: goto bad;
if (endp) *endp = (char *)str;
if (ndigits) *ndigits = num_digits;
return z;
} }
if (len && (flags & RB_INT_PARSE_SIGN)) { if (len && (flags & RB_INT_PARSE_SIGN)) {
while (ISSPACE(*str)) ADV(1); while (ISSPACE(*str)) ADV(1);
@ -4261,6 +4258,11 @@ rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
} }
return bignorm(z); return bignorm(z);
bad:
if (endp) *endp = (char *)str;
if (ndigits) *ndigits = num_digits;
return z;
} }
static VALUE static VALUE