From: Marcus Holland-Moritz <mhx-perl@gmx.net>
Date: Thu, 29 Apr 2004 18:29:28 +0000 (+0000)
Subject: More unpack cleanups.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=25a9bd2a66ab90bebdf152f1b70a957b5876ed63;p=p5sagit%2Fp5-mst-13.2.git

More unpack cleanups.

p4raw-id: //depot/perl@22754
---

diff --git a/pp_pack.c b/pp_pack.c
index 784d16e..0464536 100644
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -1425,20 +1425,17 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c
 		len = along;
 	    if (checksum) {
 		while (len-- > 0) {
-#if LONGSIZE > SIZE32 && INTSIZE == SIZE32
-		    I32 along;
-#endif
-		    COPY32(s, &along);
-		    DO_BO_UNPACK(along, 32);
-#if LONGSIZE > SIZE32
-		    if (along > 2147483647)
-		        along -= 4294967296;
+		    COPY32(s, &ai32);
+		    DO_BO_UNPACK(ai32, 32);
+#if U32SIZE > SIZE32
+		    if (ai32 > 2147483647)
+		        ai32 -= 4294967296;
 #endif
 		    s += SIZE32;
 		    if (checksum > bits_in_uv)
-			cdouble += (NV)along;
+			cdouble += (NV)ai32;
 		    else
-			cuv += along;
+			cuv += ai32;
 		}
 	    }
 	    else {
@@ -1447,18 +1444,15 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c
 		EXTEND(SP, len);
 		EXTEND_MORTAL(len);
 		while (len-- > 0) {
-#if LONGSIZE > SIZE32 && INTSIZE == SIZE32
-		    I32 along;
-#endif
-		    COPY32(s, &along);
-		    DO_BO_UNPACK(along, 32);
-#if LONGSIZE > SIZE32
-		    if (along > 2147483647)
-		        along -= 4294967296;
+		    COPY32(s, &ai32);
+		    DO_BO_UNPACK(ai32, 32);
+#if U32SIZE > SIZE32
+		    if (ai32 > 2147483647)
+		        ai32 -= 4294967296;
 #endif
 		    s += SIZE32;
 		    sv = NEWSV(42, 0);
-		    sv_setiv(sv, (IV)along);
+		    sv_setiv(sv, (IV)ai32);
 		    PUSHs(sv_2mortal(sv));
 		}
 	    }