utf8_to_uv_msgs: Remove redundant conditionals

khwilliamson · khwilliamson · commit e6951798a38b · 2025-03-17T08:40:53.000-06:00
The comments added to the code in this commit explain that to get here,
something needs to be done; no need to test again.
diff --git a/utf8.c b/utf8.c
@@ -2461,9 +2461,9 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * const s0,
                }
             } /* End of switch() on the possible problems */
 
-            /* Display or save the message (if any) for the problem being
-             * handled in this iteration of the loop */
-            if (message) {
+            /* We only get here if there is a message to be displayed or
+             * returned; each case statement in the switch above does a
+             * continue if no message for it need be generated. */
                 if (msgs) {
                     if (msgs_return == NULL) {
                         msgs_return = newAV();
@@ -2479,7 +2479,7 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * const s0,
                                                           : pack_warn),
                                                          this_flag_bit)));
                 }
-                else if (! (flags & UTF8_CHECK_ONLY)) {
+                else {
                     if (UNLIKELY(flags & ( UTF8_DIE_IF_MALFORMED
                                           |UTF8_FORCE_WARN_IF_MALFORMED)))
                     {
@@ -2508,7 +2508,6 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * const s0,
                         LEAVE;
                     }
                 }
-            }
         }   /* End of 'while (possible_problems)' */
 
         if (msgs_return) {

Original file line number	Diff line number	Diff line change
`@@ -2461,9 +2461,9 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * const s0,`
`2461`	`2461`	`}`
`2462`	`2462`	`} /* End of switch() on the possible problems */`
`2463`	`2463`
`2464`		`- /* Display or save the message (if any) for the problem being`
`2465`		`- * handled in this iteration of the loop */`
`2466`		`- if (message) {`
	`2464`	`+ /* We only get here if there is a message to be displayed or`
	`2465`	`+ * returned; each case statement in the switch above does a`
	`2466`	`+ * continue if no message for it need be generated. */`
`2467`	`2467`	`if (msgs) {`
`2468`	`2468`	`if (msgs_return == NULL) {`
`2469`	`2469`	`msgs_return = newAV();`
`@@ -2479,7 +2479,7 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * const s0,`
`2479`	`2479`	`: pack_warn),`
`2480`	`2480`	`this_flag_bit)));`
`2481`	`2481`	`}`
`2482`		`- else if (! (flags & UTF8_CHECK_ONLY)) {`
	`2482`	`+ else {`
`2483`	`2483`	`if (UNLIKELY(flags & ( UTF8_DIE_IF_MALFORMED`
`2484`	`2484`	`\|UTF8_FORCE_WARN_IF_MALFORMED)))`
`2485`	`2485`	`{`
`@@ -2508,7 +2508,6 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * const s0,`
`2508`	`2508`	`LEAVE;`
`2509`	`2509`	`}`
`2510`	`2510`	`}`
`2511`		`- }`
`2512`	`2511`	`} /* End of 'while (possible_problems)' */`
`2513`	`2512`
`2514`	`2513`	`if (msgs_return) {`