X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/b47163a2906cf2ff40db5092eaa4c948dd1e63f0..01c6f5f43bced0924a07064299094b1a8851d0a1:/pp_pack.c

diff --git a/pp_pack.c b/pp_pack.c
index 61af698..51b42d9 100644
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -62,7 +62,7 @@ typedef struct tempsym {
 	(symptr)->grpend   = NULL;	\
 	(symptr)->code     = 0;		\
 	(symptr)->length   = 0;		\
-	(symptr)->howlen   = 0;		\
+	(symptr)->howlen   = e_no_len;	\
 	(symptr)->level    = 0;		\
 	(symptr)->flags    = (f);	\
 	(symptr)->strbeg   = 0;		\
@@ -702,34 +702,27 @@ next_uni_uu(pTHX_ const char **s, const char *end, I32 *out)
     return TRUE;
 }
 
-STATIC void
-bytes_to_uni(pTHX_ const U8 *start, STRLEN len, char **dest) {
-    U8 buffer[UTF8_MAXLEN];
+STATIC char *
+S_bytes_to_uni(const U8 *start, STRLEN len, char *dest) {
     const U8 * const end = start + len;
-    char *d = *dest;
+
     while (start < end) {
-        const int length =
-	    uvuni_to_utf8_flags(buffer, NATIVE_TO_UNI(*start), 0) - buffer;
-	switch(length) {
-	  case 1:
-	    *d++ = buffer[0];
-	    break;
-	  case 2:
-	    *d++ = buffer[0];
-	    *d++ = buffer[1];
-	    break;
-	  default:
-	    Perl_croak(aTHX_ "Perl bug: value %d UTF-8 expands to %d bytes",
-		       *start, length);
+	const UV uv = NATIVE_TO_ASCII(*start);
+	if (UNI_IS_INVARIANT(uv))
+	    *dest++ = (char)(U8)UTF_TO_NATIVE(uv);
+	else {
+	    *dest++ = (char)(U8)UTF8_EIGHT_BIT_HI(uv);
+	    *dest++ = (char)(U8)UTF8_EIGHT_BIT_LO(uv);
 	}
 	start++;
     }
-    *dest = d;
+    return dest;
 }
 
 #define PUSH_BYTES(utf8, cur, buf, len)				\
 STMT_START {							\
-    if (utf8) bytes_to_uni(aTHX_ (U8 *) buf, len, &(cur));	\
+    if (utf8)							\
+	(cur) = bytes_to_uni((U8 *) buf, len, (cur));		\
     else {							\
 	Copy(buf, cur, len, char);				\
 	(cur) += (len);						\
@@ -764,7 +757,7 @@ STMT_START {					\
 STMT_START {					\
     if (utf8) {					\
 	const U8 au8 = (byte);			\
-	bytes_to_uni(aTHX_ &au8, 1, &(s));	\
+	(s) = bytes_to_uni(&au8, 1, (s));	\
     } else *(U8 *)(s)++ = (byte);		\
 } STMT_END
 
@@ -783,7 +776,7 @@ STMT_START {							\
 
 static const char *_action( const tempsym_t* symptr )
 {
-    return ( symptr->flags & FLAG_PACK ) ? "pack" : "unpack";
+    return (const char *)(( symptr->flags & FLAG_PACK ) ? "pack" : "unpack");
 }
 
 /* Returns the sizeof() struct described by pat */
@@ -1978,7 +1971,7 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c
 		    if (++bytes >= sizeof(UV)) {	/* promote to string */
 			const char *t;
 
-			sv = Perl_newSVpvf(aTHX_ "%.*"UVf, (int)TYPE_DIGITS(UV), auv);
+			sv = Perl_newSVpvf(aTHX_ "%.*"UVuf, (int)TYPE_DIGITS(UV), auv);
 			while (s < strend) {
 			    ch = SHIFT_BYTE(utf8, s, strend, datumtype);
 			    sv = mul128(sv, (U8)(ch & 0x7f));
@@ -2095,7 +2088,7 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c
              * algorithm, the code will be character-set independent
              * (and just as fast as doing character arithmetic)
              */
-            if (PL_uudmap['M'] == 0) {
+            if (PL_uudmap[(U8)'M'] == 0) {
 		size_t i;
 
 		for (i = 0; i < sizeof(PL_uuemap); ++i)
@@ -2104,7 +2097,7 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c
                  * Because ' ' and '`' map to the same value,
                  * we need to decode them both the same.
                  */
-                PL_uudmap[' '] = 0;
+                PL_uudmap[(U8)' '] = 0;
             }
 	    {
                 const STRLEN l = (STRLEN) (strend - s) * 3 / 4;
@@ -2370,14 +2363,13 @@ void
 Perl_packlist(pTHX_ SV *cat, const char *pat, const char *patend, register SV **beglist, SV **endlist )
 {
     dVAR;
-    STRLEN no_len;
     tempsym_t sym;
 
     TEMPSYM_INIT(&sym, pat, patend, FLAG_PACK);
 
     /* We're going to do changes through SvPVX(cat). Make sure it's valid.
        Also make sure any UTF8 flag is loaded */
-    SvPV_force(cat, no_len);
+    SvPV_force_nolen(cat);
     if (DO_UTF8(cat))
 	sym.flags |= FLAG_PARSE_UTF8 | FLAG_DO_UTF8;
 
@@ -2638,6 +2630,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
 		if (savsym.howlen == e_star && beglist == endlist)
 		    break;		/* No way to continue */
 	    }
+	    items = endlist - beglist;
 	    lookahead.flags  = symptr->flags & ~group_modifiers;
 	    goto no_change;
 	}
@@ -2970,7 +2963,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
 	    break;
 	case 'W': {
 	    char *end;
-	    U8 in_bytes = IN_BYTES;
+	    U8 in_bytes = (U8)IN_BYTES;
 
 	    end = start+SvLEN(cat)-1;
 	    if (utf8) end -= UTF8_MAXLEN-1;
@@ -3053,7 +3046,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
 				len+(endb-buffer)*UTF8_EXPAND);
 			end = start+SvLEN(cat);
 		    }
-		    bytes_to_uni(aTHX_ buffer, endb-buffer, &cur);
+		    cur = bytes_to_uni(buffer, endb-buffer, cur);
 		} else {
 		    if (cur >= end) {
 			*cur = '\0';