extra code in pp_concat, Take 2

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

diff --git a/xsutils.c b/xsutils.c
index 39bf560..a8a95e2 100644 (file)
--- a/xsutils.c
+++ b/xsutils.c
@@ -1,6 +1,6 @@
 /*    xsutils.c
  *
- *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+ *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
  *    by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
@@ -46,7 +46,7 @@ void XS_attributes_bootstrap(pTHX_ CV *cv);
 void
 Perl_boot_core_xsutils(pTHX)
 {
-    char *file = __FILE__;
+    const char file[] = __FILE__;
 
     newXS("attributes::bootstrap",     XS_attributes_bootstrap,        file);
 }
@@ -71,28 +71,32 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
        switch (SvTYPE(sv)) {
        case SVt_PVCV:
            switch ((int)len) {
+#ifdef CVf_ASSERTION
+           case 9:
+               if (memEQ(name, "assertion", 9)) {
+                   if (negated)
+                       CvFLAGS((CV*)sv) &= ~CVf_ASSERTION;
+                   else
+                       CvFLAGS((CV*)sv) |= CVf_ASSERTION;
+                   continue;
+               }
+               break;
+#endif
            case 6:
-               switch (*name) {
-               case 'a':
-                   if (strEQ(name, "assertion")) {
-                       if (negated)
-                           CvFLAGS((CV*)sv) &= ~CVf_ASSERTION;
-                       else
-                           CvFLAGS((CV*)sv) |= CVf_ASSERTION;
-                       continue;
-                   }
-                   break;
+               switch (name[3]) {
                case 'l':
 #ifdef CVf_LVALUE
-                   if (strEQ(name, "lvalue")) {
+                   if (memEQ(name, "lvalue", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_LVALUE;
                        else
                            CvFLAGS((CV*)sv) |= CVf_LVALUE;
                        continue;
                    }
+                   break;
+               case 'k':
 #endif /* defined CVf_LVALUE */
-                   if (strEQ(name, "locked")) {
+                   if (memEQ(name, "locked", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_LOCKED;
                        else
@@ -100,8 +104,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
                        continue;
                    }
                    break;
-               case 'm':
-                   if (strEQ(name, "method")) {
+               case 'h':
+                   if (memEQ(name, "method", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_METHOD;
                        else
@@ -116,17 +120,17 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
        default:
            switch ((int)len) {
            case 6:
-               switch (*name) {
-               case 's':
-                   if (strEQ(name, "shared")) {
+               switch (name[5]) {
+               case 'd':
+                   if (memEQ(name, "share", 5)) {
                        if (negated)
                            Perl_croak(aTHX_ "A variable may not be unshared");
                        SvSHARE(sv);
                         continue;
                     }
                    break;
-               case 'u':
-                   if (strEQ(name, "unique")) {
+               case 'e':
+                   if (memEQ(name, "uniqu", 5)) {
                        if (SvTYPE(sv) == SVt_PVGV) {
                            if (negated)
                                GvUNIQUE_off(sv);
@@ -155,7 +159,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 XS(XS_attributes_bootstrap)
 {
     dXSARGS;
-    char *file = __FILE__;
+    const char file[] = __FILE__;
+    (void)cv;
 
     if( items > 1 )
         Perl_croak(aTHX_ "Usage: attributes::bootstrap $module");
@@ -173,6 +178,7 @@ XS(XS_attributes__modify_attrs)
 {
     dXSARGS;
     SV *rv, *sv;
+    (void)cv;
 
     if (items < 1) {
 usage:
@@ -195,6 +201,7 @@ XS(XS_attributes__fetch_attrs)
     dXSARGS;
     SV *rv, *sv;
     cv_flags_t cvflags;
+    (void)cv;
 
     if (items != 1) {
 usage:
@@ -240,6 +247,7 @@ XS(XS_attributes__guess_stash)
     dXSARGS;
     SV *rv, *sv;
     dXSTARG;
+    (void)cv;
 
     if (items != 1) {
 usage:
@@ -260,7 +268,7 @@ usage:
        sv_setsv(TARG, &PL_sv_no);      /* unblessed lexical */
 #endif
     else {
-       HV *stash = Nullhv;
+       const HV *stash = Nullhv;
        switch (SvTYPE(sv)) {
        case SVt_PVCV:
            if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv)))
@@ -292,6 +300,7 @@ XS(XS_attributes_reftype)
     dXSARGS;
     SV *rv, *sv;
     dXSTARG;
+    (void)cv;
 
     if (items != 1) {
 usage:
@@ -315,6 +324,7 @@ usage:
 XS(XS_attributes__warn_reserved)
 {
     dXSARGS;
+    (void)cv;
 
     if (items != 0) {
        Perl_croak(aTHX_