Unicode data updated to be the latest beta of the Unicode 3.0.

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

diff --git a/pp_ctl.c b/pp_ctl.c
index 80cd803..2d29448 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -588,10 +588,10 @@ PP(pp_formline)
                RESTORE_NUMERIC_LOCAL();
 #if defined(USE_LONG_DOUBLE)
                if (arg & 256) {
-                   sprintf(t, "%#*.*Lf",
+                   sprintf(t, "%#*.*" PERL_PRIfldbl,
                            (int) fieldsize, (int) arg & 255, value);
                } else {
-                   sprintf(t, "%*.0Lf", (int) fieldsize, value);
+                   sprintf(t, "%*.0" PERL_PRIfldbl, (int) fieldsize, value);
                }
 #else
                if (arg & 256) {
@@ -1921,32 +1921,29 @@ S_dofindlabel(pTHX_ OP *o, char *label, OP **opstack, OP **oplimit)
        *ops++ = cUNOPo->op_first;
        if (ops >= oplimit)
            Perl_croak(aTHX_ too_deep);
-       *ops = 0;
     }
+    *ops = 0;
     if (o->op_flags & OPf_KIDS) {
        dTHR;
        /* First try all the kids at this level, since that's likeliest. */
        for (kid = cUNOPo->op_first; kid; kid = kid->op_sibling) {
-           if ((kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE)
-               && kCOP->cop_label && strEQ(kCOP->cop_label, label))
-           {
+           if ((kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE) &&
+                   kCOP->cop_label && strEQ(kCOP->cop_label, label))
                return kid;
-           }
        }
        for (kid = cUNOPo->op_first; kid; kid = kid->op_sibling) {
            if (kid == PL_lastgotoprobe)
                continue;
-           if ((kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE)
-               && (ops == opstack || (ops[-1]->op_type != OP_NEXTSTATE
-                                      && ops[-1]->op_type != OP_DBSTATE)))
-           {
+           if ((kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE) &&
+               (ops == opstack ||
+                (ops[-1]->op_type != OP_NEXTSTATE &&
+                 ops[-1]->op_type != OP_DBSTATE)))
                *ops++ = kid;
-               *ops = 0;
-           }
            if (o = dofindlabel(kid, label, ops, oplimit))
                return o;
        }
     }
+    *ops = 0;
     return 0;
 }
 
@@ -2848,7 +2845,7 @@ PP(pp_require)
                                       save the gv to manage the lifespan of
                                       the pipe, but this didn't help. XXX */
                                    filter_child_proc = (GV *)arg;
-                                   SvREFCNT_inc(filter_child_proc);
+                                   (void)SvREFCNT_inc(filter_child_proc);
                                }
                                else {
                                    if (IoOFP(io) && IoOFP(io) != IoIFP(io)) {
@@ -2866,11 +2863,11 @@ PP(pp_require)
 
                        if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVCV) {
                            filter_sub = arg;
-                           SvREFCNT_inc(filter_sub);
+                           (void)SvREFCNT_inc(filter_sub);
 
                            if (i < count) {
                                filter_state = SP[i];
-                               SvREFCNT_inc(filter_state);
+                               (void)SvREFCNT_inc(filter_state);
                            }
 
                            if (tryrsfp == 0) {