RE: [PATCH] RE: maint snapshot @ 19525

Message-ID: <533D273D4014D411AB1D00062938C4D90404653C@hotel.npl.co.uk>

p4raw-id: //depot/perl@19599

5 files changed, 40 insertions, 128 deletions

diff --git a/embed.pl b/embed.pl
index 4ba0eb9b8a..2f2072d47e 100755
--- a/embed.pl
+++ b/embed.pl
@@ -202,11 +202,8 @@ sub write_protos {
 	if( $flags =~ /f/ ) {
 	    my $prefix = $flags =~ /n/ ? '' : 'pTHX_';
 	    my $args = scalar @args;
-	    $ret .= "\n#ifdef CHECK_FORMAT\n";
-	    $ret .=
-		sprintf " __attribute__((__format__(__printf__,%s%d,%s%d)))",
+	    $ret .= sprintf "\n\t__attribute__format__(__printf__,%s%d,%s%d)",
 				    $prefix, $args - 1, $prefix, $args;
-	    $ret .= "\n#endif\n";
 	}
 	$ret .= ";";
 	$ret .= ' */' if $flags =~ /m/;
diff --git a/perl.h b/perl.h
index 62f43a2766..d53015f0f9 100644
--- a/perl.h
+++ b/perl.h
@@ -2140,6 +2140,14 @@ typedef pthread_key_t	perl_key;
 #  endif
 #endif
 
+#ifndef __attribute__format__
+#  ifdef CHECK_FORMAT
+#    define __attribute__format__(x,y,z) __attribute__((__format__(x,y,z)))
+#  else
+#    define __attribute__format__(x,y,z)
+#  endif
+#endif
+ 
 /* Some unistd.h's give a prototype for pause() even though
    HAS_PAUSE ends up undefined.  This causes the #define
    below to be rejected by the compiler.  Sigh.
diff --git a/perlio.c b/perlio.c
index 765882eff6..05b53c91bf 100644
--- a/perlio.c
+++ b/perlio.c
@@ -434,10 +434,7 @@ PerlIO_findFILE(PerlIO *pio)
  * Why is this here - not in perlio.h?  RMB
  */
 void PerlIO_debug(const char *fmt, ...)
-#ifdef CHECK_FORMAT
-    __attribute__ ((__format__(__printf__, 1, 2)))
-#endif
-;
+    __attribute__format__(__printf__, 1, 2);
 
 void
 PerlIO_debug(const char *fmt, ...)
diff --git a/perlio.h b/perlio.h
index 4d88439b85..754bb57336 100644
--- a/perlio.h
+++ b/perlio.h
@@ -208,10 +208,7 @@ extern void PerlIO_init(pTHX);
 #endif
 #ifndef PerlIO_stdoutf
 extern int PerlIO_stdoutf(const char *, ...)
-#ifdef CHECK_FORMAT
-    __attribute__ ((__format__(__printf__, 1, 2)))
-#endif
-;
+    __attribute__format__(__printf__, 1, 2);
 #endif
 #ifndef PerlIO_puts
 extern int PerlIO_puts(PerlIO *, const char *);
@@ -271,17 +268,11 @@ extern void PerlIO_setlinebuf(PerlIO *);
 #endif
 #ifndef PerlIO_printf
 extern int PerlIO_printf(PerlIO *, const char *, ...)
-#ifdef CHECK_FORMAT
-    __attribute__ ((__format__(__printf__, 2, 3)))
-#endif
-;
+    __attribute__format__(__printf__, 2, 3);
 #endif
 #ifndef PerlIO_sprintf
 extern int PerlIO_sprintf(char *, int, const char *, ...)
-#ifdef CHECK_FORMAT
-    __attribute__ ((__format__(__printf__, 3, 4)))
-#endif
-;
+    __attribute__format__(__printf__, 3, 4);
 #endif
 #ifndef PerlIO_vprintf
 extern int PerlIO_vprintf(PerlIO *, const char *, va_list);
diff --git a/proto.h b/proto.h
index c9994e908b..97844a56d3 100644
--- a/proto.h
+++ b/proto.h
@@ -89,83 +89,38 @@ PERL_CALLCONV I32	Perl_my_chsize(pTHX_ int fd, Off_t length);
 #endif
 PERL_CALLCONV OP*	Perl_convert(pTHX_ I32 optype, I32 flags, OP* o);
 PERL_CALLCONV void	Perl_croak(pTHX_ const char* pat, ...) __attribute__((noreturn))
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_1,pTHX_2)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_1,pTHX_2);
 PERL_CALLCONV void	Perl_vcroak(pTHX_ const char* pat, va_list* args) __attribute__((noreturn));
 #if defined(PERL_IMPLICIT_CONTEXT)
 PERL_CALLCONV void	Perl_croak_nocontext(const char* pat, ...) __attribute__((noreturn))
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 PERL_CALLCONV OP*	Perl_die_nocontext(const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 PERL_CALLCONV void	Perl_deb_nocontext(const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 PERL_CALLCONV char*	Perl_form_nocontext(const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 PERL_CALLCONV void	Perl_load_module_nocontext(U32 flags, SV* name, SV* ver, ...);
 PERL_CALLCONV SV*	Perl_mess_nocontext(const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 PERL_CALLCONV void	Perl_warn_nocontext(const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 PERL_CALLCONV void	Perl_warner_nocontext(U32 err, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,2,3)))
-#endif
-;
+	__attribute__format__(__printf__,2,3);
 PERL_CALLCONV SV*	Perl_newSVpvf_nocontext(const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 PERL_CALLCONV void	Perl_sv_catpvf_nocontext(SV* sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,2,3)))
-#endif
-;
+	__attribute__format__(__printf__,2,3);
 PERL_CALLCONV void	Perl_sv_setpvf_nocontext(SV* sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,2,3)))
-#endif
-;
+	__attribute__format__(__printf__,2,3);
 PERL_CALLCONV void	Perl_sv_catpvf_mg_nocontext(SV* sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,2,3)))
-#endif
-;
+	__attribute__format__(__printf__,2,3);
 PERL_CALLCONV void	Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,2,3)))
-#endif
-;
+	__attribute__format__(__printf__,2,3);
 PERL_CALLCONV int	Perl_fprintf_nocontext(PerlIO* stream, const char* fmt, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,2,3)))
-#endif
-;
+	__attribute__format__(__printf__,2,3);
 PERL_CALLCONV int	Perl_printf_nocontext(const char* fmt, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,1,2)))
-#endif
-;
+	__attribute__format__(__printf__,1,2);
 #endif
 PERL_CALLCONV void	Perl_cv_ckproto(pTHX_ CV* cv, GV* gv, char* p);
 PERL_CALLCONV CV*	Perl_cv_clone(pTHX_ CV* proto);
@@ -183,10 +138,7 @@ PERL_CALLCONV U32*	Perl_get_opargs(pTHX);
 PERL_CALLCONV PPADDR_t*	Perl_get_ppaddr(pTHX);
 PERL_CALLCONV I32	Perl_cxinc(pTHX);
 PERL_CALLCONV void	Perl_deb(pTHX_ const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_1,pTHX_2)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_1,pTHX_2);
 PERL_CALLCONV void	Perl_vdeb(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_debprofdump(pTHX);
 PERL_CALLCONV I32	Perl_debop(pTHX_ OP* o);
@@ -196,10 +148,7 @@ PERL_CALLCONV char*	Perl_delimcpy(pTHX_ char* to, char* toend, char* from, char*
 PERL_CALLCONV void	Perl_deprecate(pTHX_ char* s);
 PERL_CALLCONV void	Perl_deprecate_old(pTHX_ char* s);
 PERL_CALLCONV OP*	Perl_die(pTHX_ const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_1,pTHX_2)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_1,pTHX_2);
 PERL_CALLCONV OP*	Perl_vdie(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV OP*	Perl_die_where(pTHX_ char* message, STRLEN msglen);
 PERL_CALLCONV void	Perl_dounwind(pTHX_ I32 cxix);
@@ -263,10 +212,7 @@ PERL_CALLCONV char*	Perl_find_script(pTHX_ char *scriptname, bool dosearch, char
 PERL_CALLCONV OP*	Perl_force_list(pTHX_ OP* arg);
 PERL_CALLCONV OP*	Perl_fold_constants(pTHX_ OP* arg);
 PERL_CALLCONV char*	Perl_form(pTHX_ const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_1,pTHX_2)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_1,pTHX_2);
 PERL_CALLCONV char*	Perl_vform(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_free_tmps(pTHX);
 PERL_CALLCONV OP*	Perl_gen_constant_list(pTHX_ OP* o);
@@ -461,10 +407,7 @@ PERL_CALLCONV void	Perl_markstack_grow(pTHX);
 PERL_CALLCONV char*	Perl_mem_collxfrm(pTHX_ const char* s, STRLEN len, STRLEN* xlen);
 #endif
 PERL_CALLCONV SV*	Perl_mess(pTHX_ const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_1,pTHX_2)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_1,pTHX_2);
 PERL_CALLCONV SV*	Perl_vmess(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_qerror(pTHX_ SV* err);
 PERL_CALLCONV void	Perl_sortsv(pTHX_ SV ** array, size_t num_elts, SVCOMPARE_t cmp);
@@ -560,10 +503,7 @@ PERL_CALLCONV SV*	Perl_newSVpv(pTHX_ const char* s, STRLEN len);
 PERL_CALLCONV SV*	Perl_newSVpvn(pTHX_ const char* s, STRLEN len);
 PERL_CALLCONV SV*	Perl_newSVpvn_share(pTHX_ const char* s, I32 len, U32 hash);
 PERL_CALLCONV SV*	Perl_newSVpvf(pTHX_ const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_1,pTHX_2)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_1,pTHX_2);
 PERL_CALLCONV SV*	Perl_vnewSVpvf(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV SV*	Perl_newSVrv(pTHX_ SV* rv, const char* classname);
 PERL_CALLCONV SV*	Perl_newSVsv(pTHX_ SV* old);
@@ -743,10 +683,7 @@ PERL_CALLCONV void	Perl_sv_add_arena(pTHX_ char* ptr, U32 size, U32 flags);
 PERL_CALLCONV int	Perl_sv_backoff(pTHX_ SV* sv);
 PERL_CALLCONV SV*	Perl_sv_bless(pTHX_ SV* sv, HV* stash);
 PERL_CALLCONV void	Perl_sv_catpvf(pTHX_ SV* sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_2,pTHX_3)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_2,pTHX_3);
 PERL_CALLCONV void	Perl_sv_vcatpvf(pTHX_ SV* sv, const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_sv_catpv(pTHX_ SV* sv, const char* ptr);
 /* PERL_CALLCONV void	sv_catpvn(pTHX_ SV* sv, const char* ptr, STRLEN len); */
@@ -795,10 +732,7 @@ PERL_CALLCONV void	Perl_sv_replace(pTHX_ SV* sv, SV* nsv);
 PERL_CALLCONV void	Perl_sv_report_used(pTHX);
 PERL_CALLCONV void	Perl_sv_reset(pTHX_ char* s, HV* stash);
 PERL_CALLCONV void	Perl_sv_setpvf(pTHX_ SV* sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_2,pTHX_3)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_2,pTHX_3);
 PERL_CALLCONV void	Perl_sv_vsetpvf(pTHX_ SV* sv, const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_sv_setiv(pTHX_ SV* sv, IV num);
 PERL_CALLCONV void	Perl_sv_setpviv(pTHX_ SV* sv, IV num);
@@ -865,16 +799,10 @@ PERL_CALLCONV U32	Perl_parse_unicode_opts(pTHX_ char **popt);
 PERL_CALLCONV void	Perl_report_evil_fh(pTHX_ GV *gv, IO *io, I32 op);
 PERL_CALLCONV void	Perl_report_uninit(pTHX);
 PERL_CALLCONV void	Perl_warn(pTHX_ const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_1,pTHX_2)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_1,pTHX_2);
 PERL_CALLCONV void	Perl_vwarn(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_warner(pTHX_ U32 err, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_2,pTHX_3)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_2,pTHX_3);
 PERL_CALLCONV void	Perl_vwarner(pTHX_ U32 err, const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_watch(pTHX_ char** addr);
 PERL_CALLCONV I32	Perl_whichsig(pTHX_ char* sig);
@@ -899,19 +827,13 @@ PERL_CALLCONV struct perl_vars *	Perl_GetVars(pTHX);
 PERL_CALLCONV int	Perl_runops_standard(pTHX);
 PERL_CALLCONV int	Perl_runops_debug(pTHX);
 PERL_CALLCONV void	Perl_sv_catpvf_mg(pTHX_ SV *sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_2,pTHX_3)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_2,pTHX_3);
 PERL_CALLCONV void	Perl_sv_vcatpvf_mg(pTHX_ SV* sv, const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_sv_catpv_mg(pTHX_ SV *sv, const char *ptr);
 PERL_CALLCONV void	Perl_sv_catpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len);
 PERL_CALLCONV void	Perl_sv_catsv_mg(pTHX_ SV *dstr, SV *sstr);
 PERL_CALLCONV void	Perl_sv_setpvf_mg(pTHX_ SV *sv, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_2,pTHX_3)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_2,pTHX_3);
 PERL_CALLCONV void	Perl_sv_vsetpvf_mg(pTHX_ SV* sv, const char* pat, va_list* args);
 PERL_CALLCONV void	Perl_sv_setiv_mg(pTHX_ SV *sv, IV i);
 PERL_CALLCONV void	Perl_sv_setpviv_mg(pTHX_ SV *sv, IV iv);
@@ -924,10 +846,7 @@ PERL_CALLCONV void	Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len);
 PERL_CALLCONV MGVTBL*	Perl_get_vtbl(pTHX_ int vtbl_id);
 PERL_CALLCONV char*	Perl_pv_display(pTHX_ SV *dsv, char *pv, STRLEN cur, STRLEN len, STRLEN pvlim);
 PERL_CALLCONV void	Perl_dump_indent(pTHX_ I32 level, PerlIO *file, const char* pat, ...)
-#ifdef CHECK_FORMAT
- __attribute__((__format__(__printf__,pTHX_3,pTHX_4)))
-#endif
-;
+	__attribute__format__(__printf__,pTHX_3,pTHX_4);
 PERL_CALLCONV void	Perl_dump_vindent(pTHX_ I32 level, PerlIO *file, const char* pat, va_list *args);
 PERL_CALLCONV void	Perl_do_gv_dump(pTHX_ I32 level, PerlIO *file, char *name, GV *sv);
 PERL_CALLCONV void	Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, char *name, GV *sv);