RE: perl@19333

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

p4raw-id: //depot/perl@19373

diff --git a/embed.pl b/embed.pl
index 0b3d5ce..8da5df7 100755 (executable)
--- a/embed.pl
+++ b/embed.pl
@@ -203,7 +203,7 @@ sub write_protos {
            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 " __attribute__((format(__printf__,%s%d,%s%d)))",
                                    $prefix, $args - 1, $prefix, $args;
            $ret .= "\n#endif\n";
        }

diff --git a/pp_hot.c b/pp_hot.c
index c6a533b..d907570 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -2939,7 +2939,7 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
           HE* he;
          he = hv_fetch_ent(PL_stashcache, sv, 0, 0);
           if (he) { 
-            stash = (HV*)SvIV(HeVAL(he));
+            stash = INT2PTR(HV*,SvIV(HeVAL(he)));
             goto fetch;
           }
         }
@@ -2965,7 +2965,7 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
            if (!stash)
                packsv = sv;
             else {
-               SV* ref = newSViv((IV)stash);
+               SV* ref = newSViv(PTR2IV(stash));
                hv_store(PL_stashcache, packname, packlen, ref, 0);
            }
            goto fetch;

diff --git a/pp_pack.c b/pp_pack.c
index 5c05b7a..8bcc570 100644 (file)
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -418,7 +418,7 @@ S_next_symbol(pTHX_ register tempsym_t* symptr )
         if (strchr(natstr, code))
          code |= TYPE_IS_SHRIEKING;
         else
-         Perl_croak(aTHX_ "'!' allowed only after types %s in pack/unpack",
+         Perl_croak(aTHX_ "'!' allowed only after types %s in %s",
                      natstr, symptr->flags & FLAG_PACK ? "pack" : "unpack" );
       }
 

diff --git a/proto.h b/proto.h
index 2421889..a4077db 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -90,80 +90,80 @@ PERL_CALLCONV I32   Perl_my_chsize(pTHX_ int fd, Off_t length);
 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)))
+ __attribute__((format(__printf__,pTHX_1,pTHX_2)))
 #endif
 ;
 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)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 PERL_CALLCONV OP*      Perl_die_nocontext(const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,1,2)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 PERL_CALLCONV void     Perl_deb_nocontext(const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,1,2)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 PERL_CALLCONV char*    Perl_form_nocontext(const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,1,2)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 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)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 PERL_CALLCONV void     Perl_warn_nocontext(const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,1,2)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 PERL_CALLCONV void     Perl_warner_nocontext(U32 err, const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,2,3)))
+ __attribute__((format(__printf__,2,3)))
 #endif
 ;
 PERL_CALLCONV SV*      Perl_newSVpvf_nocontext(const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,1,2)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_catpvf_nocontext(SV* sv, const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,2,3)))
+ __attribute__((format(__printf__,2,3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_setpvf_nocontext(SV* sv, const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,2,3)))
+ __attribute__((format(__printf__,2,3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_catpvf_mg_nocontext(SV* sv, const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,2,3)))
+ __attribute__((format(__printf__,2,3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,2,3)))
+ __attribute__((format(__printf__,2,3)))
 #endif
 ;
 PERL_CALLCONV int      Perl_fprintf_nocontext(PerlIO* stream, const char* fmt, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,2,3)))
+ __attribute__((format(__printf__,2,3)))
 #endif
 ;
 PERL_CALLCONV int      Perl_printf_nocontext(const char* fmt, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,1,2)))
+ __attribute__((format(__printf__,1,2)))
 #endif
 ;
 #endif
@@ -184,7 +184,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_1,pTHX_2)))
 #endif
 ;
 PERL_CALLCONV void     Perl_vdeb(pTHX_ const char* pat, va_list* args);
@@ -197,7 +197,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_1,pTHX_2)))
 #endif
 ;
 PERL_CALLCONV OP*      Perl_vdie(pTHX_ const char* pat, va_list* args);
@@ -264,7 +264,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_1,pTHX_2)))
 #endif
 ;
 PERL_CALLCONV char*    Perl_vform(pTHX_ const char* pat, va_list* args);
@@ -462,7 +462,7 @@ PERL_CALLCONV char* Perl_mem_collxfrm(pTHX_ const char* s, STRLEN len, STRLEN* x
 #endif
 PERL_CALLCONV SV*      Perl_mess(pTHX_ const char* pat, ...)
 #ifdef CHECK_FORMAT
- __attribute__((format(printf,pTHX_1,pTHX_2)))
+ __attribute__((format(__printf__,pTHX_1,pTHX_2)))
 #endif
 ;
 PERL_CALLCONV SV*      Perl_vmess(pTHX_ const char* pat, va_list* args);
@@ -561,7 +561,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_1,pTHX_2)))
 #endif
 ;
 PERL_CALLCONV SV*      Perl_vnewSVpvf(pTHX_ const char* pat, va_list* args);
@@ -742,7 +742,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_2,pTHX_3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_vcatpvf(pTHX_ SV* sv, const char* pat, va_list* args);
@@ -794,7 +794,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_2,pTHX_3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_vsetpvf(pTHX_ SV* sv, const char* pat, va_list* args);
@@ -863,13 +863,13 @@ 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)))
+ __attribute__((format(__printf__,pTHX_1,pTHX_2)))
 #endif
 ;
 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)))
+ __attribute__((format(__printf__,pTHX_2,pTHX_3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_vwarner(pTHX_ U32 err, const char* pat, va_list* args);
@@ -897,7 +897,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_2,pTHX_3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_vcatpvf_mg(pTHX_ SV* sv, const char* pat, va_list* args);
@@ -906,7 +906,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_2,pTHX_3)))
 #endif
 ;
 PERL_CALLCONV void     Perl_sv_vsetpvf_mg(pTHX_ SV* sv, const char* pat, va_list* args);
@@ -922,7 +922,7 @@ 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)))
+ __attribute__((format(__printf__,pTHX_3,pTHX_4)))
 #endif
 ;
 PERL_CALLCONV void     Perl_dump_vindent(pTHX_ I32 level, PerlIO *file, const char* pat, va_list *args);