utf8n_to_uvchr_msgs: Remove an #ifdef

khwilliamson · khwilliamson · commit 4921e0647476 · 2024-10-02T09:33:47.000-06:00
A previous commit removed this spot from having to deal with UTF-8
invariants that don't want to be translated to EBCDIC, leaving only
cases that do, so we can move the code to deal with it to here, and
remove the #ifdef.  The macro call is a no-op on ASCII machines.
diff --git a/inline.h b/inline.h
@@ -3043,9 +3043,6 @@ Perl_utf8n_to_uvchr_msgs(const U8 *s,
         }
 
         if (LIKELY(state == 0)) {
-#ifdef EBCDIC
-            uv = UNI_TO_NATIVE(uv);
-#endif
                 goto success;
         }
 
@@ -3059,7 +3056,7 @@ Perl_utf8n_to_uvchr_msgs(const U8 *s,
                 *retlen = s - s0 + 1;
             }
 
-            return uv;
+            return UNI_TO_NATIVE(uv);
 }
 
 PERL_STATIC_INLINE UV

Original file line number	Diff line number	Diff line change
`@@ -3043,9 +3043,6 @@ Perl_utf8n_to_uvchr_msgs(const U8 *s,`
`3043`	`3043`	`}`
`3044`	`3044`
`3045`	`3045`	`if (LIKELY(state == 0)) {`
`3046`		`-#ifdef EBCDIC`
`3047`		`- uv = UNI_TO_NATIVE(uv);`
`3048`		`-#endif`
`3049`	`3046`	`goto success;`
`3050`	`3047`	`}`
`3051`	`3048`
`@@ -3059,7 +3056,7 @@ Perl_utf8n_to_uvchr_msgs(const U8 *s,`
`3059`	`3056`	`*retlen = s - s0 + 1;`
`3060`	`3057`	`}`
`3061`	`3058`
`3062`		`- return uv;`
	`3059`	`+ return UNI_TO_NATIVE(uv);`
`3063`	`3060`	`}`
`3064`	`3061`
`3065`	`3062`	`PERL_STATIC_INLINE UV`