X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=a7987f419e9d926b64b6aa01e3d8d1fb98a4c419;hb=a9581ec21a2686ca09657757555fcd66435bb205;hp=aaa4c22e1ab71a857753d6badb664e3854b8a643;hpb=774d564bb7dd1ed64ca0d7e534aa67e93f991f02;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index aaa4c22..a7987f4 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -39,23 +39,18 @@
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
     STMT_START {							\
-	char vn[255], *module = SvPV(ST(0),na);				\
+	char *vn = "", *module = SvPV(ST(0),na);			\
 	if (items >= 2)	 /* version supplied as bootstrap arg */	\
 	    Sv = ST(1);							\
 	else {								\
-	    sprintf(vn,"%s::XS_VERSION", module);			\
-	    Sv = perl_get_sv(vn, FALSE);   /* XXX GV_ADDWARN */		\
-	    if (!Sv || !SvOK(Sv)) {					\
-		sprintf(vn,"%s::VERSION", module);			\
-		Sv = perl_get_sv(vn, FALSE);   /* XXX GV_ADDWARN */	\
-	    }								\
+	    /* XXX GV_ADDWARN */					\
+	    Sv = perl_get_sv(vn = form("%s::XS_VERSION", module), FALSE); \
+	    if (!Sv || !SvOK(Sv))					\
+		Sv = perl_get_sv(vn = form("%s::VERSION", module), FALSE); \
 	}								\
-	if (!Sv || !SvOK(Sv))						\
-	    croak("%s object can't find $%s::XS_VERSION or $%s::VERSION", \
-		  module, module, module);				\
-	else if (strNE(XS_VERSION, SvPV(Sv, na)))			\
-	    croak("%s object version %s does not match $%s %s",		\
-		  module, XS_VERSION, vn, SvPV(Sv, na));		\
+	if (Sv && (!SvOK(Sv) || strNE(XS_VERSION, SvPV(Sv, na))))	\
+	    croak("%s object version %s does not match $%s %_",		\
+		  module, XS_VERSION, vn, Sv);				\
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK