Correct taint.t to skip the truncate test if $Config{d_truncate} is false.

[perl5.git] / XSUB.h

diff --git a/XSUB.h b/XSUB.h
index 7a7e882..a2cfccd 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -73,7 +73,7 @@ handled automatically by C<xsubpp>.
 
 =for apidoc Ams||dUNDERBAR
 Sets up any variable needed by the C<UNDERBAR> macro. It used to define
-C<padoff_du>, but it is currently a noop. However, it is strongly adviced
+C<padoff_du>, but it is currently a noop. However, it is strongly advised
 to still use it for ensuring past and future compatibility.
 
 =for apidoc AmU||UNDERBAR
@@ -298,66 +298,13 @@ Rethrows a previously caught exception.  See L<perlguts/"Exception Handling">.
 
 #ifdef XS_VERSION
 #  define XS_VERSION_BOOTCHECK                                         \
-    STMT_START {                                                       \
-       SV *_sv;                                                        \
-       const char *vn = NULL, *module = SvPV_nolen_const(ST(0));       \
-       if (items >= 2)  /* version supplied as bootstrap arg */        \
-           _sv = ST(1);                                                \
-       else {                                                          \
-           /* XXX GV_ADDWARN */                                        \
-           _sv = get_sv(Perl_form(aTHX_ "%s::%s", module,              \
-                               vn = "XS_VERSION"), 0);                 \
-           if (!_sv || !SvOK(_sv))                                     \
-               _sv = get_sv(Perl_form(aTHX_ "%s::%s", module,          \
-                                   vn = "VERSION"), 0);                \
-       }                                                               \
-       if (_sv) {                                                      \
-           SV *xpt = NULL;                                             \
-           SV *xssv = Perl_newSVpvn(aTHX_ STR_WITH_LEN(XS_VERSION));   \
-           SV *pmsv = sv_derived_from(_sv, "version")                  \
-               ? SvREFCNT_inc_simple_NN(_sv)                           \
-               : new_version(_sv);                                     \
-           xssv = upg_version(xssv, 0);                                \
-           if ( vcmp(pmsv,xssv) ) {                                    \
-               xpt = Perl_newSVpvf(aTHX_ "%s object version %"SVf      \
-                                   " does not match %s%s%s%s %"SVf,    \
-                                   module,                             \
-                                   SVfARG(Perl_sv_2mortal(aTHX_ vstringify(xssv))), \
-                                   vn ? "$" : "", vn ? module : "",    \
-                                   vn ? "::" : "",                     \
-                                   vn ? vn : "bootstrap parameter",    \
-                                   SVfARG(Perl_sv_2mortal(aTHX_ vstringify(pmsv)))); \
-               Perl_sv_2mortal(aTHX_ xpt);                             \
-           }                                                           \
-           SvREFCNT_dec(xssv);                                         \
-           SvREFCNT_dec(pmsv);                                         \
-           if (xpt)                                                    \
-               Perl_croak_sv(aTHX_ xpt);                               \
-       }                                                               \
-    } STMT_END
+    Perl_xs_version_bootcheck(aTHX_ items, ax, STR_WITH_LEN(XS_VERSION))
 #else
 #  define XS_VERSION_BOOTCHECK
 #endif
 
 #define XS_APIVERSION_BOOTCHECK                                                \
-    STMT_START {                                                       \
-       SV *_xpt = NULL;                                                \
-       SV *_compver = Perl_newSVpv(aTHX_ "v" PERL_API_VERSION_STRING, 0); \
-       SV *_runver = new_version(PL_apiversion);                       \
-       _compver = upg_version(_compver, 0);                            \
-       if (vcmp(_compver, _runver)) {                                  \
-           _xpt = Perl_newSVpvf(aTHX_ "Perl API version %"SVf          \
-                                " of %s does not match %"SVf,          \
-                                SVfARG(Perl_sv_2mortal(aTHX_ vstringify(_compver))), \
-                                SvPV_nolen_const(ST(0)),               \
-                                SVfARG(Perl_sv_2mortal(aTHX_ vstringify(_runver)))); \
-           Perl_sv_2mortal(aTHX_ _xpt);                                \
-       }                                                               \
-       SvREFCNT_dec(_compver);                                         \
-       SvREFCNT_dec(_runver);                                          \
-       if (_xpt)                                                       \
-           Perl_croak_sv(aTHX_ _xpt);                                  \
-    } STMT_END
+    Perl_xs_apiversion_bootcheck(aTHX_ ST(0), STR_WITH_LEN("v" PERL_API_VERSION_STRING))
 
 #ifdef NO_XSLOCKS
 #  define dXCPT             dJMPENV; int rEtV = 0