X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=ff923a61def79251daf1750ab389aa5804269097;hb=7bf1b6bbb95d87030998c89eb72d5f6ca8be6937;hp=604a66454ed6b4916272b13a106998f27cd77488;hpb=8e84507e42a00e64817e92106359a5275566dc19;p=p5sagit%2Fp5-mst-13.2.git diff --git a/proto.h b/proto.h index 604a664..ff923a6 100644 --- a/proto.h +++ b/proto.h @@ -104,75 +104,75 @@ PERL_CALLCONV MAGIC* Perl_condpair_magic(pTHX_ SV *sv); #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 HASATTRIBUTE +#ifdef CHECK_FORMAT __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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,1,2))) #endif ; PERL_CALLCONV OP* Perl_die_nocontext(const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,1,2))) #endif ; PERL_CALLCONV void Perl_deb_nocontext(const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,1,2))) #endif ; PERL_CALLCONV char* Perl_form_nocontext(const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,1,2))) #endif ; PERL_CALLCONV void Perl_warn_nocontext(const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,1,2))) #endif ; PERL_CALLCONV void Perl_warner_nocontext(U32 err, const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,2,3))) #endif ; PERL_CALLCONV SV* Perl_newSVpvf_nocontext(const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,1,2))) #endif ; PERL_CALLCONV void Perl_sv_catpvf_nocontext(SV* sv, const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,2,3))) #endif ; PERL_CALLCONV void Perl_sv_setpvf_nocontext(SV* sv, const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,2,3))) #endif ; PERL_CALLCONV void Perl_sv_catpvf_mg_nocontext(SV* sv, const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,2,3))) #endif ; PERL_CALLCONV void Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,2,3))) #endif ; PERL_CALLCONV int Perl_fprintf_nocontext(PerlIO* stream, const char* fmt, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,2,3))) #endif ; @@ -193,7 +193,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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_1,pTHX_2))) #endif ; @@ -205,7 +205,7 @@ PERL_CALLCONV I32 Perl_debstackptrs(pTHX); PERL_CALLCONV char* Perl_delimcpy(pTHX_ char* to, char* toend, char* from, char* fromend, int delim, I32* retlen); PERL_CALLCONV void Perl_deprecate(pTHX_ char* s); PERL_CALLCONV OP* Perl_die(pTHX_ const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_1,pTHX_2))) #endif ; @@ -269,7 +269,7 @@ PERL_CALLCONV PADOFFSET Perl_find_threadsv(pTHX_ const char *name); 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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_1,pTHX_2))) #endif ; @@ -365,7 +365,7 @@ PERL_CALLCONV bool Perl_is_uni_xdigit_lc(pTHX_ U32 c); PERL_CALLCONV U32 Perl_to_uni_upper_lc(pTHX_ U32 c); PERL_CALLCONV U32 Perl_to_uni_title_lc(pTHX_ U32 c); PERL_CALLCONV U32 Perl_to_uni_lower_lc(pTHX_ U32 c); -PERL_CALLCONV int Perl_is_utf8_char(pTHX_ U8 *p); +PERL_CALLCONV STRLEN Perl_is_utf8_char(pTHX_ U8 *p); PERL_CALLCONV bool Perl_is_utf8_string(pTHX_ U8 *s, STRLEN len); PERL_CALLCONV bool Perl_is_utf8_alnum(pTHX_ U8 *p); PERL_CALLCONV bool Perl_is_utf8_alnumc(pTHX_ U8 *p); @@ -451,7 +451,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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_1,pTHX_2))) #endif ; @@ -504,7 +504,7 @@ PERL_CALLCONV OP* Perl_newANONHASH(pTHX_ OP* o); PERL_CALLCONV OP* Perl_newANONSUB(pTHX_ I32 floor, OP* proto, OP* block); PERL_CALLCONV OP* Perl_newASSIGNOP(pTHX_ I32 flags, OP* left, I32 optype, OP* right); PERL_CALLCONV OP* Perl_newCONDOP(pTHX_ I32 flags, OP* expr, OP* trueop, OP* falseop); -PERL_CALLCONV void Perl_newCONSTSUB(pTHX_ HV* stash, char* name, SV* sv); +PERL_CALLCONV CV* Perl_newCONSTSUB(pTHX_ HV* stash, char* name, SV* sv); PERL_CALLCONV void Perl_newFORM(pTHX_ I32 floor, OP* o, OP* block); PERL_CALLCONV OP* Perl_newFOROP(pTHX_ I32 flags, char* label, line_t forline, OP* sclr, OP* expr, OP*block, OP*cont); PERL_CALLCONV OP* Perl_newLOGOP(pTHX_ I32 optype, I32 flags, OP* left, OP* right); @@ -545,7 +545,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, STRLEN len, U32 hash); PERL_CALLCONV SV* Perl_newSVpvf(pTHX_ const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_1,pTHX_2))) #endif ; @@ -595,9 +595,9 @@ PERL_CALLCONV HV* Perl_get_hv(pTHX_ const char* name, I32 create); PERL_CALLCONV CV* Perl_get_cv(pTHX_ const char* name, I32 create); PERL_CALLCONV int Perl_init_i18nl10n(pTHX_ int printwarn); PERL_CALLCONV int Perl_init_i18nl14n(pTHX_ int printwarn); -PERL_CALLCONV void Perl_new_collate(pTHX_ const char* newcoll); -PERL_CALLCONV void Perl_new_ctype(pTHX_ const char* newctype); -PERL_CALLCONV void Perl_new_numeric(pTHX_ const char* newcoll); +PERL_CALLCONV void Perl_new_collate(pTHX_ char* newcoll); +PERL_CALLCONV void Perl_new_ctype(pTHX_ char* newctype); +PERL_CALLCONV void Perl_new_numeric(pTHX_ char* newcoll); PERL_CALLCONV void Perl_set_numeric_local(pTHX); PERL_CALLCONV void Perl_set_numeric_radix(pTHX); PERL_CALLCONV void Perl_set_numeric_standard(pTHX); @@ -677,10 +677,10 @@ PERL_CALLCONV OP* Perl_scalar(pTHX_ OP* o); PERL_CALLCONV OP* Perl_scalarkids(pTHX_ OP* o); PERL_CALLCONV OP* Perl_scalarseq(pTHX_ OP* o); PERL_CALLCONV OP* Perl_scalarvoid(pTHX_ OP* o); -PERL_CALLCONV NV Perl_scan_bin(pTHX_ char* start, I32 len, I32* retlen); -PERL_CALLCONV NV Perl_scan_hex(pTHX_ char* start, I32 len, I32* retlen); -PERL_CALLCONV char* Perl_scan_num(pTHX_ char* s); -PERL_CALLCONV NV Perl_scan_oct(pTHX_ char* start, I32 len, I32* retlen); +PERL_CALLCONV NV Perl_scan_bin(pTHX_ char* start, STRLEN len, STRLEN* retlen); +PERL_CALLCONV NV Perl_scan_hex(pTHX_ char* start, STRLEN len, STRLEN* retlen); +PERL_CALLCONV char* Perl_scan_num(pTHX_ char* s, YYSTYPE *lvalp); +PERL_CALLCONV NV Perl_scan_oct(pTHX_ char* start, STRLEN len, STRLEN* retlen); PERL_CALLCONV OP* Perl_scope(pTHX_ OP* o); PERL_CALLCONV char* Perl_screaminstr(pTHX_ SV* bigsv, SV* littlesv, I32 start_shift, I32 end_shift, I32 *state, I32 last); #if !defined(VMS) @@ -714,7 +714,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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_2,pTHX_3))) #endif ; @@ -761,7 +761,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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_2,pTHX_3))) #endif ; @@ -809,8 +809,8 @@ PERL_CALLCONV I32 Perl_utf8_distance(pTHX_ U8 *a, U8 *b); PERL_CALLCONV U8* Perl_utf8_hop(pTHX_ U8 *s, I32 off); PERL_CALLCONV U8* Perl_utf8_to_bytes(pTHX_ U8 *s, STRLEN *len); PERL_CALLCONV U8* Perl_bytes_to_utf8(pTHX_ U8 *s, STRLEN *len); -PERL_CALLCONV UV Perl_utf8_to_uv(pTHX_ U8 *s, I32* retlen); -PERL_CALLCONV UV Perl_utf8_to_uv_chk(pTHX_ U8 *s, I32* retlen, bool checking); +PERL_CALLCONV UV Perl_utf8_to_uv_simple(pTHX_ U8 *s, STRLEN* retlen); +PERL_CALLCONV UV Perl_utf8_to_uv(pTHX_ U8 *s, STRLEN curlen, STRLEN* retlen, U32 flags); PERL_CALLCONV U8* Perl_uv_to_utf8(pTHX_ U8 *d, UV uv); PERL_CALLCONV void Perl_vivify_defelem(pTHX_ SV* sv); PERL_CALLCONV void Perl_vivify_ref(pTHX_ SV* sv, U32 to_what); @@ -818,13 +818,13 @@ PERL_CALLCONV I32 Perl_wait4pid(pTHX_ Pid_t pid, int* statusp, int flags); 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 HASATTRIBUTE +#ifdef CHECK_FORMAT __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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_2,pTHX_3))) #endif ; @@ -832,7 +832,8 @@ 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); PERL_CALLCONV int Perl_yyerror(pTHX_ char* s); -#if defined(USE_PURE_BISON) +#ifdef USE_PURE_BISON +PERL_CALLCONV int Perl_yylex_r(pTHX_ YYSTYPE *lvalp, int *lcharp); PERL_CALLCONV int Perl_yylex(pTHX_ YYSTYPE *lvalp, int *lcharp); #else PERL_CALLCONV int Perl_yylex(pTHX); @@ -862,7 +863,7 @@ PERL_CALLCONV int Perl_runops_debug(pTHX); PERL_CALLCONV SV* Perl_sv_lock(pTHX_ SV *sv); #endif PERL_CALLCONV void Perl_sv_catpvf_mg(pTHX_ SV *sv, const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_2,pTHX_3))) #endif ; @@ -871,7 +872,7 @@ 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 HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_2,pTHX_3))) #endif ; @@ -887,7 +888,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 *sv, char *pv, STRLEN cur, STRLEN len, STRLEN pvlim); PERL_CALLCONV void Perl_dump_indent(pTHX_ I32 level, PerlIO *file, const char* pat, ...) -#ifdef HASATTRIBUTE +#ifdef CHECK_FORMAT __attribute__((format(printf,pTHX_3,pTHX_4))) #endif ; @@ -1102,7 +1103,7 @@ STATIC regnode* S_reg(pTHX_ I32, I32 *); STATIC regnode* S_reganode(pTHX_ U8, U32); STATIC regnode* S_regatom(pTHX_ I32 *); STATIC regnode* S_regbranch(pTHX_ I32 *, I32); -STATIC void S_reguni(pTHX_ UV, char *, I32*); +STATIC void S_reguni(pTHX_ UV, char *, STRLEN*); STATIC regnode* S_regclass(pTHX); STATIC regnode* S_regclassutf8(pTHX); STATIC I32 S_regcurly(pTHX_ char *); @@ -1256,6 +1257,7 @@ STATIC SV* S_isa_lookup(pTHX_ HV *stash, const char *name, int len, int level); #endif #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) +STATIC char* S_stdize_locale(pTHX_ char* locs); STATIC SV* S_mess_alloc(pTHX); # if defined(LEAKTEST) STATIC void S_xstat(pTHX_ int);