Skip to content

Commit

Permalink
clean up compilation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
doy committed Jun 27, 2012
1 parent f7f0fde commit 4f8dbb2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions dquote_static.c
Expand Up @@ -196,6 +196,7 @@ S_grok_bslash_x(pTHX_ const char *s,

PERL_ARGS_ASSERT_GROK_BSLASH_X;

PERL_UNUSED_ARG(output_warning);

assert(*s == 'x');
s++;
Expand Down
1 change: 1 addition & 0 deletions mg.c
Expand Up @@ -3412,6 +3412,7 @@ Perl_magic_copycallchecker(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
MAGIC *nmg;

PERL_ARGS_ASSERT_MAGIC_COPYCALLCHECKER;
PERL_UNUSED_ARG(sv);
PERL_UNUSED_ARG(name);
PERL_UNUSED_ARG(namlen);

Expand Down
3 changes: 1 addition & 2 deletions pp.c
Expand Up @@ -650,10 +650,9 @@ PP(pp_gelem)
PP(pp_study)
{
dVAR; dSP; dPOPss;
register unsigned char *s;
STRLEN len;

s = (unsigned char*)(SvPV(sv, len));
len = SvCUR(sv);
if (len == 0 || len > I32_MAX || !SvPOK(sv) || SvUTF8(sv) || SvVALID(sv)) {
/* Historically, study was skipped in these cases. */
RETPUSHNO;
Expand Down
8 changes: 5 additions & 3 deletions regexec.c
Expand Up @@ -126,10 +126,9 @@
#else
# define LOAD_UTF8_CHARCLASS(class,str) STMT_START { \
if (!CAT2(PL_utf8_,class)) { \
bool ok; \
ENTER; save_re_context(); \
ok=CAT2(is_utf8_,class)((const U8*)str); \
assert(ok); assert(CAT2(PL_utf8_,class)); LEAVE; } } STMT_END
assert(CAT2(is_utf8_,class)((const U8*)str)); \
assert(CAT2(PL_utf8_,class)); LEAVE; } } STMT_END
#endif

/* Doesn't do an assert to verify that is correct */
Expand Down Expand Up @@ -3167,6 +3166,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
multicall_oldcatch = 0;
multicall_cv = NULL;
cx = NULL;
PERL_UNUSED_VAR(multicall_cop);
PERL_UNUSED_VAR(newsp);


PERL_ARGS_ASSERT_REGMATCH;
Expand Down Expand Up @@ -6038,6 +6039,7 @@ NULL
if (last_pushed_cv) {
dSP;
POP_MULTICALL;
PERL_UNUSED_VAR(SP);
}

/* clean up; in particular, free all slabs above current one */
Expand Down
2 changes: 1 addition & 1 deletion toke.c
Expand Up @@ -9060,7 +9060,7 @@ S_pmflag(pTHX_ const char* const valid_flags, U32 * pmfl, char** s, char* charse

if ( charlen != 1 || ! strchr(valid_flags, c) ) {
if (isALNUM_lazy_if(*s, UTF)) {
yyerror_pv(Perl_form(aTHX_ "Unknown regexp modifier \"/%.*s\"", charlen, *s),
yyerror_pv(Perl_form(aTHX_ "Unknown regexp modifier \"/%.*s\"", (int)charlen, *s),
UTF ? SVf_UTF8 : 0);
(*s) += charlen;
/* Pretend that it worked, so will continue processing before
Expand Down

0 comments on commit 4f8dbb2

Please sign in to comment.