Change 34069: Rename the new macro clear_errsv() from last patch to CLEAR_ERRSV()

[Rafael Garcia-Suarez]

Change 34069 by [EMAIL PROTECTED] on 2008/06/17 11:16:38

        Rename the new macro clear_errsv() from last patch to CLEAR_ERRSV()

Affected files ...

... //depot/perl/op.c#1006 edit
... //depot/perl/perl.c#872 edit
... //depot/perl/perl.h#839 edit
... //depot/perl/pp_ctl.c#693 edit
... //depot/perl/t/op/eval.t#34 edit

Differences ...

==== //depot/perl/op.c#1006 (text) ====
Index: perl/op.c
--- perl/op.c#1005~34068~       2008-06-17 04:13:38.000000000 -0700
+++ perl/op.c   2008-06-17 04:16:38.000000000 -0700
@@ -2521,7 +2521,7 @@
     case 3:
        /* Something tried to die.  Abandon constant folding.  */
        /* Pretend the error never happened.  */
-        clear_errsv();
+       CLEAR_ERRSV();
        o->op_next = old_next;
        break;
     default:

==== //depot/perl/perl.c#872 (text) ====
Index: perl/perl.c
--- perl/perl.c#871~34068~      2008-06-17 04:13:38.000000000 -0700
+++ perl/perl.c 2008-06-17 04:16:38.000000000 -0700
@@ -2680,7 +2680,7 @@
            CALL_BODY_SUB((OP*)&myop);
            retval = PL_stack_sp - (PL_stack_base + oldmark);
            if (!(flags & G_KEEPERR)) {
-               clear_errsv();
+               CLEAR_ERRSV();
            }
            break;
        case 1:
@@ -2782,7 +2782,7 @@
        CALL_BODY_EVAL((OP*)&myop);
        retval = PL_stack_sp - (PL_stack_base + oldmark);
        if (!(flags & G_KEEPERR)) {
-           clear_errsv();
+           CLEAR_ERRSV();
        }
        break;
     case 1:
@@ -3561,7 +3561,7 @@
     gv_SVadd(PL_errgv);
 #endif
     sv_grow(ERRSV, 240);       /* Preallocate - for immediate signals. */
-    clear_errsv();
+    CLEAR_ERRSV();
     PL_curstash = PL_defstash;
     CopSTASH_set(&PL_compiling, PL_defstash);
     PL_debstash = GvHV(gv_fetchpvs("DB::", GV_ADDMULTI, SVt_PVHV));

==== //depot/perl/perl.h#839 (text) ====
Index: perl/perl.h
--- perl/perl.h#838~34068~      2008-06-17 04:13:38.000000000 -0700
+++ perl/perl.h 2008-06-17 04:16:38.000000000 -0700
@@ -6008,7 +6008,7 @@
 
 #endif /* Include guard */
 
-#define clear_errsv() STMT_START { sv_setpvn(ERRSV,"",0); if 
(SvMAGICAL(ERRSV)) { mg_free(ERRSV); } SvPOK_only(ERRSV); } STMT_END
+#define CLEAR_ERRSV() STMT_START { sv_setpvn(ERRSV,"",0); if 
(SvMAGICAL(ERRSV)) { mg_free(ERRSV); } SvPOK_only(ERRSV); } STMT_END
 
 /*
  * Local variables:

==== //depot/perl/pp_ctl.c#693 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#692~34068~    2008-06-17 04:13:38.000000000 -0700
+++ perl/pp_ctl.c       2008-06-17 04:16:38.000000000 -0700
@@ -2149,7 +2149,7 @@
 
     LEAVESUB(sv);
     if (clear_errsv) {
-       clear_errsv();
+       CLEAR_ERRSV();
     }
     return retop;
 }
@@ -3001,9 +3001,8 @@
     CopARYBASE_set(PL_curcop, 0);
     if (saveop && (saveop->op_type != OP_REQUIRE) && (saveop->op_flags & 
OPf_SPECIAL))
        PL_in_eval |= EVAL_KEEPERR;
-    else {
-       clear_errsv();
-    }
+    else
+       CLEAR_ERRSV();
     if (yyparse() || PL_parser->error_count || !PL_eval_root) {
        SV **newsp;                     /* Used by POPBLOCK. */
        PERL_CONTEXT *cx = &cxstack[cxstack_ix];
@@ -3775,7 +3774,7 @@
     else {
        LEAVE;
        if (!(save_flags & OPf_SPECIAL)) {
-           clear_errsv();
+           CLEAR_ERRSV();
        }
     }
 
@@ -3819,9 +3818,8 @@
     PL_in_eval = EVAL_INEVAL;
     if (flags & G_KEEPERR)
        PL_in_eval |= EVAL_KEEPERR;
-    else {
-       clear_errsv();
-    }
+    else
+       CLEAR_ERRSV();
     if (flags & G_FAKINGEVAL) {
        PL_eval_root = PL_op; /* Only needed so that goto works right. */
     }
@@ -3880,7 +3878,7 @@
     PL_curpm = newpm;  /* Don't pop $1 et al till now */
 
     LEAVE;
-    clear_errsv();
+    CLEAR_ERRSV();
     RETURN;
 }
 
End of Patch.