summaryrefslogtreecommitdiff
path: root/pp_pack.c
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2014-06-13 21:48:53 -0400
committerJarkko Hietaniemi <jhi@iki.fi>2014-06-13 21:48:53 -0400
commitb57b04d533ba5d71576359062a3470c22080f76d (patch)
tree41acee35d9a43f0be44c9d08336590f242d3f362 /pp_pack.c
parent8c2b19724d117cecfa186d044abdbf766372c679 (diff)
downloadperl-b57b04d533ba5d71576359062a3470c22080f76d.tar.gz
Revert "Some low-hanging -Wunreachable-code fruits."
This reverts commit 8c2b19724d117cecfa186d044abdbf766372c679. I don't understand - smoke-me came back happy with three separate reports... oh well, some other time.
Diffstat (limited to 'pp_pack.c')
-rw-r--r--pp_pack.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/pp_pack.c b/pp_pack.c
index f877fe21af..998982d77c 100644
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -448,7 +448,7 @@ S_measure_struct(pTHX_ tempsym_t* symptr)
case e_star:
Perl_croak(aTHX_ "Within []-length '*' not allowed in %s",
_action( symptr ) );
-
+ break;
default:
/* e_no_len and e_number */
len = symptr->length;
@@ -567,7 +567,7 @@ S_group_end(pTHX_ const char *patptr, const char *patend, char ender)
}
Perl_croak(aTHX_ "No group ending character '%c' found in template",
ender);
- NOT_REACHED; /* NOTREACHED */
+ return 0;
}
@@ -934,7 +934,7 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c
cuv = 0;
cdouble = 0;
continue;
-
+ break;
case '(':
{
tempsym_t savsym = *symptr;
@@ -1060,7 +1060,7 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c
break;
case '/':
Perl_croak(aTHX_ "'/' must follow a numeric type in unpack");
-
+ break;
case 'A':
case 'Z':
case 'a':
@@ -2083,7 +2083,6 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
bool found = next_symbol(symptr);
bool utf8 = (symptr->flags & FLAG_PARSE_UTF8) ? 1 : 0;
bool warn_utf8 = ckWARN(WARN_UTF8);
- char* from;
PERL_ARGS_ASSERT_PACK_REC;
@@ -2164,7 +2163,8 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
(int) TYPE_NO_MODIFIERS(datumtype));
case '%':
Perl_croak(aTHX_ "'%%' may not be used in pack");
-
+ {
+ char *from;
case '.' | TYPE_IS_SHRIEKING:
case '.':
if (howlen == e_star) from = start;
@@ -2213,7 +2213,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
goto shrink;
}
break;
-
+ }
case '(': {
tempsym_t savsym = *symptr;
U32 group_modifiers = TYPE_MODIFIERS(datumtype & ~symptr->flags);