1 files changed, 15 insertions, 16 deletions

diff --git a/sv.c b/sv.c
index a20eae84e5..9dfbadbf60 100644
--- a/sv.c
+++ b/sv.c
@@ -349,9 +349,9 @@ S_more_sv(pTHX)
         PL_nice_chunk_size = 0;
     }
     else {
-	char *chunk; /* must use New here to match call to Safefree()      */
-	New(704,chunk,PERL_ARENA_SIZE,char);   /*  in sv_free_arenas()     */
-	sv_add_arena(chunk, PERL_ARENA_SIZE, 0);
+	char *chunk;                /* must use New here to match call to */
+	New(704,chunk,1008,char);   /* Safefree() in sv_free_arenas()     */
+	sv_add_arena(chunk, 1008, 0);
     }
     uproot_SV(sv);
     return sv;
@@ -673,7 +673,6 @@ S_find_hash_subscript(pTHX_ HV *hv, SV* val)
 {
     dVAR;
     register HE **array;
-    register HE *entry;
     I32 i;
 
     if (!hv || SvMAGICAL(hv) || !HvARRAY(hv) ||
@@ -683,6 +682,7 @@ S_find_hash_subscript(pTHX_ HV *hv, SV* val)
     array = HvARRAY(hv);
 
     for (i=HvMAX(hv); i>0; i--) {
+	register HE *entry;
 	for (entry = array[i]; entry; entry = HeNEXT(entry)) {
 	    if (HeVAL(entry) != val)
 		continue;
@@ -835,8 +835,8 @@ S_find_uninit_var(pTHX_ OP* obase, SV* uninit_sv, bool match)
     case OP_PADAV:
     case OP_PADHV:
       {
-	bool pad  = (obase->op_type == OP_PADAV || obase->op_type == OP_PADHV);
-	bool hash = (obase->op_type == OP_PADHV || obase->op_type == OP_RV2HV);
+	const bool pad  = (obase->op_type == OP_PADAV || obase->op_type == OP_PADHV);
+	const bool hash = (obase->op_type == OP_PADHV || obase->op_type == OP_RV2HV);
 	I32 index = 0;
 	SV *keysv = Nullsv;
 	int subscript_type = FUV_SUBSCRIPT_WITHIN;
@@ -986,9 +986,9 @@ S_find_uninit_var(pTHX_ OP* obase, SV* uninit_sv, bool match)
 						keysv, 0, FUV_SUBSCRIPT_HASH);
 	    }
 	    else {
-		I32 index = S_find_array_subscript(aTHX_ (AV*)sv, uninit_sv);
+		const I32 index = S_find_array_subscript(aTHX_ (AV*)sv, uninit_sv);
 		if (index >= 0)
-		return S_varname(aTHX_ gv, "@", o->op_targ,
+		    return S_varname(aTHX_ gv, "@", o->op_targ,
 					Nullsv, index, FUV_SUBSCRIPT_ARRAY);
 	    }
 	    if (match)
@@ -2652,7 +2652,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags)
     }
     else if (SvPOKp(sv) && SvLEN(sv)) {
 	UV value;
-	int numtype = grok_number(SvPVX(sv), SvCUR(sv), &value);
+	const int numtype = grok_number(SvPVX(sv), SvCUR(sv), &value);
 	/* We want to avoid a possible problem when we cache an IV which
 	   may be later translated to an NV, and the resulting NV is not
 	   the same as the direct translation of the initial string
@@ -2955,7 +2955,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags)
     }
     else if (SvPOKp(sv) && SvLEN(sv)) {
 	UV value;
-	int numtype = grok_number(SvPVX(sv), SvCUR(sv), &value);
+	const int numtype = grok_number(SvPVX(sv), SvCUR(sv), &value);
 
 	/* We want to avoid a possible problem when we cache a UV which
 	   may be later translated to an NV, and the resulting NV is not
@@ -3205,7 +3205,7 @@ Perl_sv_2nv(pTHX_ register SV *sv)
     }
     else if (SvPOKp(sv) && SvLEN(sv)) {
 	UV value;
-	int numtype = grok_number(SvPVX(sv), SvCUR(sv), &value);
+	const int numtype = grok_number(SvPVX(sv), SvCUR(sv), &value);
 	if (ckWARN(WARN_NUMERIC) && !SvIOKp(sv) && !numtype)
 	    not_a_number(sv);
 #ifdef NV_PRESERVES_UV
@@ -5051,7 +5051,7 @@ refer to the same chunk of data.
 */
 
 void
-Perl_sv_chop(pTHX_ register SV *sv, register char *ptr)
+Perl_sv_chop(pTHX_ register SV *sv, register const char *ptr)
 {
     register STRLEN delta;
     if (!ptr || !SvPOKp(sv))
@@ -5063,7 +5063,7 @@ Perl_sv_chop(pTHX_ register SV *sv, register char *ptr)
 
     if (!SvOOK(sv)) {
 	if (!SvLEN(sv)) { /* make copy of shared string */
-	    char *pvx = SvPVX(sv);
+	    const char *pvx = SvPVX(sv);
 	    STRLEN len = SvCUR(sv);
 	    SvGROW(sv, len + 1);
 	    Move(pvx,SvPVX(sv),len,char);
@@ -5116,9 +5116,8 @@ void
 Perl_sv_catpvn_flags(pTHX_ register SV *dsv, register const char *sstr, register STRLEN slen, I32 flags)
 {
     STRLEN dlen;
-    char *dstr;
+    const char *dstr = SvPV_force_flags(dsv, dlen, flags);
 
-    dstr = SvPV_force_flags(dsv, dlen, flags);
     SvGROW(dsv, dlen + slen + 1);
     if (sstr == dstr)
 	sstr = SvPVX(dsv);
@@ -6961,7 +6960,7 @@ Perl_sv_gets(pTHX_ register SV *sv, register PerlIO *fp, I32 append)
 	 */
 	Stat_t st;
 	if (!PerlLIO_fstat(PerlIO_fileno(fp), &st) && S_ISREG(st.st_mode))  {
-	    Off_t offset = PerlIO_tell(fp);
+	    const Off_t offset = PerlIO_tell(fp);
 	    if (offset != (Off_t) -1 && st.st_size + append > offset) {
 	     	(void) SvGROW(sv, (STRLEN)((st.st_size - offset) + append + 1));
 	    }