I infer that change 25891 as-is would break OS2. This should fix it.

[p5sagit/p5-mst-13.2.git] / ext / attrs / attrs.xs

diff --git a/ext/attrs/attrs.xs b/ext/attrs/attrs.xs
index da952d5..e3ba012 100644 (file)
--- a/ext/attrs/attrs.xs
+++ b/ext/attrs/attrs.xs
@@ -1,9 +1,10 @@
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
 static cv_flags_t
-get_flag(char *attr)
+get_flag(const char *attr)
 {
     if (strnEQ(attr, "method", 6))
        return CVf_METHOD;
@@ -16,19 +17,23 @@ get_flag(char *attr)
 MODULE = attrs         PACKAGE = attrs
 
 void
-import(Class, ...)
-char * Class
+import(...)
     ALIAS:
        unimport = 1
     PREINIT:
        int i;
-       CV *cv;
     PPCODE:
+       if (items < 1)
+           Perl_croak(aTHX_ "Usage: %s(Class, ...)", GvNAME(CvGV(cv)));
        if (!PL_compcv || !(cv = CvOUTSIDE(PL_compcv)))
            croak("can't set attributes outside a subroutine scope");
+       if (ckWARN(WARN_DEPRECATED))
+           Perl_warner(aTHX_ packWARN(WARN_DEPRECATED),
+                       "pragma \"attrs\" is deprecated, "
+                       "use \"sub NAME : ATTRS\" instead");
        for (i = 1; i < items; i++) {
-           char *attr = SvPV(ST(i), PL_na);
-           cv_flags_t flag = get_flag(attr);
+           const char * const attr = SvPV_nolen(ST(i));
+           const cv_flags_t flag = get_flag(attr);
            if (!flag)
                croak("invalid attribute name %s", attr);
            if (ix)
@@ -47,13 +52,13 @@ SV *        sub
                sub = Nullsv;
        }
        else {
-           char *name = SvPV(sub, PL_na);
+           const char * const name = SvPV_nolen(sub);
            sub = (SV*)perl_get_cv(name, FALSE);
        }
        if (!sub)
            croak("invalid subroutine reference or name");
        if (CvFLAGS(sub) & CVf_METHOD)
-           XPUSHs(sv_2mortal(newSVpv("method", 0)));
+           XPUSHs(sv_2mortal(newSVpvn("method", 6)));
        if (CvFLAGS(sub) & CVf_LOCKED)
-           XPUSHs(sv_2mortal(newSVpv("locked", 0)));
+           XPUSHs(sv_2mortal(newSVpvn("locked", 6)));