pp_pack.c: S_utf8_to_bytes: Rmv loop

Prior to this commit, the code went through the buffer with warnings
turned off, but saving the fact if there were problems.  If so, it ran
through the buffer again, with warnings turned on to display those
problems.

I'm unsure of why it didn't output any warnings until it got to the end.
But utf8_to_uv_msgs() allows us to store up the messages and output them
later, without having to reparse

Author: khwilliamson

pp_pack.c

@@ -288,46 +288,67 @@ S_utf8_to_bytes(pTHX_ const char **s, const char *end, const char *buf, SSize_t
     if (UNLIKELY(needs_swap))
         buf += buf_len;
 
+    AV * msgs = NULL;
     for (; buf_len > 0; buf_len--) {
         if (from >= end) return FALSE;
-        if (! utf8_to_uv_flags((U8 *) from, (U8 *) end, &val, &retlen, flags))
-        {
-            bad |= 1;
-        }
 
+        AV * this_msgs = NULL;
+        if (utf8_to_uv_msgs((U8 *) from, (U8 *) end, &val, &retlen, flags,
+                            NULL, &this_msgs))
+        {
             if (val >= 0x100) {
                 bad |= 2;
                 val = (U8) val;
             }
+        }
 
         from += retlen;
 
+        /* Add any messages from this conversion to the list for later output
+         * */
+        if (this_msgs) {
+            while (av_count(this_msgs) > 0) {
+                av_push(msgs, av_shift(this_msgs));
+            }
+
+            Safefree(this_msgs);
+        }
+
         if (UNLIKELY(needs_swap))
             *(U8 *)--buf = (U8)val;
         else
             *(U8 *)buf++ = (U8)val;
     }
 
     /* We have enough characters for the buffer. Did we have problems ? */
-    if (bad) {
-        if (bad & 1) {
-            /* Rewalk the string fragment while warning */
-            const char *ptr;
-            const U32 flags = ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY;
-            for (ptr = *s; ptr < from; ptr += UTF8SKIP(ptr)) {
-                if (ptr >= end) break;
-                utf8n_to_uvchr((U8 *) ptr, end-ptr, &retlen, flags);
-            }
-            if (from > end) from = end;
+    if (msgs) {
+        while (av_count(msgs) > 0) {
+            HV * msg_hash = (HV *) av_shift(msgs);
+            SV ** packed_categories_p = hv_fetchs(msg_hash, "warn_categories", 0);
+            if (packed_categories_p == NULL) {
+                continue;
+            }
+
+            UV packed_categories = SvUV(*packed_categories_p);
+            if (packed_categories == 0) {
+                continue;
+            }
+
+            SV ** warn_text_p = hv_fetchs(msg_hash, "text", 0);
+            if (warn_text_p) {
+                warner(packed_categories, "%s", SvPV_nolen(*warn_text_p));
+            }
         }
 
+        Safefree(msgs);
+    }
+
     if ((bad & 2))
         ck_warner(packWARN(datumtype & TYPE_IS_PACK ?
                             WARN_PACK : WARN_UNPACK),
                   "Character(s) in '%c' format wrapped in %s",
                   (int) TYPE_NO_MODIFIERS(datumtype),
                   datumtype & TYPE_IS_PACK ? "pack" : "unpack");
-    }
 
     *s = from;
     return TRUE;