perly-fixer

[p5sagit/p5-mst-13.2.git] / regcomp.c

diff --git a/regcomp.c b/regcomp.c
index 854dc59..4bfef22 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -3206,7 +3206,7 @@ tryagain:
                         }
                         else {
                              reguni(pRExC_state, ender, s, &unilen);
-                             if (numlen > 0) {
+                             if (unilen > 0) {
                                   s   += unilen;
                                   len += unilen;
                              }
@@ -3243,7 +3243,7 @@ tryagain:
                     }
                     else {
                          reguni(pRExC_state, ender, s, &unilen);
-                         if (numlen > 0) {
+                         if (unilen > 0) {
                               s   += unilen;
                               len += unilen;
                          }
@@ -4088,14 +4088,9 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state)
                else if (prevnatvalue == natvalue) {
                    Perl_sv_catpvf(aTHX_ listsv, "%04"UVxf"\n", natvalue);
                    if (FOLD) {
-                        U8 tmpbuf [UTF8_MAXLEN+1];
                         U8 foldbuf[UTF8_MAXLEN_FOLD+1];
                         STRLEN foldlen;
-                        UV f;
-
-                        uvchr_to_utf8(tmpbuf, natvalue);
-                        to_utf8_fold(tmpbuf, foldbuf, &foldlen);
-                        f = UNI_TO_NATIVE(utf8_to_uvchr(foldbuf, 0));
+                        UV f = to_uni_fold(natvalue, foldbuf, &foldlen);
 
                         /* If folding and foldable and a single
                          * character, insert also the folded version