X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=3013bd7c6846f1aa6ab6a9eb17d1d9ae2023a0c9;hb=dcd846f4e75a65911ac82259fb309a534622cbd6;hp=76cb2f3e317515fa5d37da5beaa95902a8b823db;hpb=69282e910994b718c7eedc8f550888058a4e93ff;p=p5sagit%2Fp5-mst-13.2.git diff --git a/proto.h b/proto.h index 76cb2f3..3013bd7 100644 --- a/proto.h +++ b/proto.h @@ -10,9 +10,8 @@ START_EXTERN_C #if defined(PERL_IMPLICIT_SYS) PERL_CALLCONV PerlInterpreter* perl_alloc_using(struct IPerlMem* m, struct IPerlMem* ms, struct IPerlMem* mp, struct IPerlEnv* e, struct IPerlStdIO* io, struct IPerlLIO* lio, struct IPerlDir* d, struct IPerlSock* s, struct IPerlProc* p); -#else -PERL_CALLCONV PerlInterpreter* perl_alloc(void); #endif +PERL_CALLCONV PerlInterpreter* perl_alloc(void); PERL_CALLCONV void perl_construct(PerlInterpreter* interp); PERL_CALLCONV void perl_destruct(PerlInterpreter* interp); PERL_CALLCONV void perl_free(PerlInterpreter* interp); @@ -99,22 +98,78 @@ PERL_CALLCONV I32 Perl_my_chsize(pTHX_ int fd, Off_t length); 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)); +PERL_CALLCONV void Perl_croak(pTHX_ const char* pat, ...) __attribute__((noreturn)) +#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)); -PERL_CALLCONV OP* Perl_die_nocontext(const char* pat, ...); -PERL_CALLCONV void Perl_deb_nocontext(const char* pat, ...); -PERL_CALLCONV char* Perl_form_nocontext(const char* pat, ...); -PERL_CALLCONV SV* Perl_mess_nocontext(const char* pat, ...); -PERL_CALLCONV void Perl_warn_nocontext(const char* pat, ...); -PERL_CALLCONV void Perl_warner_nocontext(U32 err, const char* pat, ...); -PERL_CALLCONV SV* Perl_newSVpvf_nocontext(const char* pat, ...); -PERL_CALLCONV void Perl_sv_catpvf_nocontext(SV* sv, const char* pat, ...); -PERL_CALLCONV void Perl_sv_setpvf_nocontext(SV* sv, const char* pat, ...); -PERL_CALLCONV void Perl_sv_catpvf_mg_nocontext(SV* sv, const char* pat, ...); -PERL_CALLCONV void Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...); -PERL_CALLCONV int Perl_fprintf_nocontext(PerlIO* stream, const char* fmt, ...); +PERL_CALLCONV void Perl_croak_nocontext(const char* pat, ...) __attribute__((noreturn)) +#ifdef CHECK_FORMAT + __attribute__((format(printf,1,2))) +#endif +; +PERL_CALLCONV OP* Perl_die_nocontext(const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,1,2))) +#endif +; +PERL_CALLCONV void Perl_deb_nocontext(const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,1,2))) +#endif +; +PERL_CALLCONV char* Perl_form_nocontext(const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,1,2))) +#endif +; +PERL_CALLCONV SV* Perl_mess_nocontext(const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,1,2))) +#endif +; +PERL_CALLCONV void Perl_warn_nocontext(const char* pat, ...) +#ifdef CHECK_FORMAT + __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))) +#endif +; +PERL_CALLCONV SV* Perl_newSVpvf_nocontext(const char* pat, ...) +#ifdef CHECK_FORMAT + __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))) +#endif +; +PERL_CALLCONV void Perl_sv_setpvf_nocontext(SV* sv, const char* pat, ...) +#ifdef CHECK_FORMAT + __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))) +#endif +; +PERL_CALLCONV void Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...) +#ifdef CHECK_FORMAT + __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))) +#endif +; #endif PERL_CALLCONV void Perl_cv_ckproto(pTHX_ CV* cv, GV* gv, char* p); PERL_CALLCONV CV* Perl_cv_clone(pTHX_ CV* proto); @@ -131,7 +186,11 @@ PERL_CALLCONV char* Perl_get_no_modify(pTHX); 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, ...); +PERL_CALLCONV void Perl_deb(pTHX_ const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_1,pTHX_2))) +#endif +; 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); @@ -139,7 +198,11 @@ PERL_CALLCONV I32 Perl_debstack(pTHX); 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, ...); +PERL_CALLCONV OP* Perl_die(pTHX_ const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_1,pTHX_2))) +#endif +; 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); @@ -199,7 +262,11 @@ PERL_CALLCONV PADOFFSET Perl_find_threadsv(pTHX_ const char *name); #endif 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, ...); +PERL_CALLCONV char* Perl_form(pTHX_ const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_1,pTHX_2))) +#endif +; 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); @@ -369,7 +436,11 @@ PERL_CALLCONV void Perl_markstack_grow(pTHX); #if defined(USE_LOCALE_COLLATE) PERL_CALLCONV char* Perl_mem_collxfrm(pTHX_ const char* s, STRLEN len, STRLEN* xlen); #endif -PERL_CALLCONV SV* Perl_mess(pTHX_ const char* pat, ...); +PERL_CALLCONV SV* Perl_mess(pTHX_ const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_1,pTHX_2))) +#endif +; PERL_CALLCONV SV* Perl_vmess(pTHX_ const char* pat, va_list* args); PERL_CALLCONV void Perl_qerror(pTHX_ SV* err); PERL_CALLCONV int Perl_mg_clear(pTHX_ SV* sv); @@ -456,7 +527,11 @@ PERL_CALLCONV SV* Perl_newSViv(pTHX_ IV i); PERL_CALLCONV SV* Perl_newSVnv(pTHX_ NV n); 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_newSVpvf(pTHX_ const char* pat, ...); +PERL_CALLCONV SV* Perl_newSVpvf(pTHX_ const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_1,pTHX_2))) +#endif +; 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); @@ -620,7 +695,11 @@ PERL_CALLCONV I32 Perl_sv_true(pTHX_ SV *sv); 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, ...); +PERL_CALLCONV void Perl_sv_catpvf(pTHX_ SV* sv, const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_2,pTHX_3))) +#endif +; 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 Perl_sv_catpvn(pTHX_ SV* sv, const char* ptr, STRLEN len); @@ -663,7 +742,11 @@ PERL_CALLCONV char* Perl_sv_reftype(pTHX_ SV* sv, int ob); 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, ...); +PERL_CALLCONV void Perl_sv_setpvf(pTHX_ SV* sv, const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_2,pTHX_3))) +#endif +; 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); @@ -685,6 +768,7 @@ PERL_CALLCONV bool Perl_sv_upgrade(pTHX_ SV* sv, U32 mt); PERL_CALLCONV void Perl_sv_usepvn(pTHX_ SV* sv, char* ptr, STRLEN len); PERL_CALLCONV void Perl_sv_vcatpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *maybe_tainted); PERL_CALLCONV void Perl_sv_vsetpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *maybe_tainted); +PERL_CALLCONV NV Perl_str_to_version(pTHX_ SV *sv); PERL_CALLCONV SV* Perl_swash_init(pTHX_ char* pkg, char* name, SV* listsv, I32 minbits, I32 none); PERL_CALLCONV UV Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr); PERL_CALLCONV void Perl_taint_env(pTHX); @@ -712,9 +796,17 @@ PERL_CALLCONV void Perl_vivify_ref(pTHX_ SV* sv, U32 to_what); PERL_CALLCONV I32 Perl_wait4pid(pTHX_ Pid_t pid, int* statusp, int flags); PERL_CALLCONV void Perl_report_closed_fh(pTHX_ GV *gv, IO *io, const char *func, const char *obj); PERL_CALLCONV void Perl_report_uninit(pTHX); -PERL_CALLCONV void Perl_warn(pTHX_ const char* pat, ...); +PERL_CALLCONV void Perl_warn(pTHX_ const char* pat, ...) +#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, ...); +PERL_CALLCONV void Perl_warner(pTHX_ U32 err, const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_2,pTHX_3))) +#endif +; 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); @@ -728,6 +820,7 @@ PERL_CALLCONV int Perl_yyparse(pTHX); PERL_CALLCONV int Perl_yywarn(pTHX_ char* s); #if defined(MYMALLOC) PERL_CALLCONV void Perl_dump_mstats(pTHX_ char* s); +PERL_CALLCONV int Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level); #endif PERL_CALLCONV Malloc_t Perl_safesysmalloc(MEM_SIZE nbytes); PERL_CALLCONV Malloc_t Perl_safesyscalloc(MEM_SIZE elements, MEM_SIZE size); @@ -744,12 +837,20 @@ PERL_CALLCONV struct perl_vars * Perl_GetVars(pTHX); #endif 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, ...); +PERL_CALLCONV void Perl_sv_catpvf_mg(pTHX_ SV *sv, const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_2,pTHX_3))) +#endif +; 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, ...); +PERL_CALLCONV void Perl_sv_setpvf_mg(pTHX_ SV *sv, const char* pat, ...) +#ifdef CHECK_FORMAT + __attribute__((format(printf,pTHX_2,pTHX_3))) +#endif +; 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); @@ -761,7 +862,11 @@ PERL_CALLCONV void Perl_sv_setsv_mg(pTHX_ SV *dstr, SV *sstr); 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, ...); +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 +; 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); @@ -771,8 +876,10 @@ PERL_CALLCONV void Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, OP *o); PERL_CALLCONV void Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, PMOP *pm); PERL_CALLCONV void Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim); PERL_CALLCONV void Perl_magic_dump(pTHX_ MAGIC *mg); +#if defined(PERL_FLEXIBLE_EXCEPTIONS) PERL_CALLCONV void* Perl_default_protect(pTHX_ volatile JMPENV *je, int *excpt, protect_body_t body, ...); PERL_CALLCONV void* Perl_vdefault_protect(pTHX_ volatile JMPENV *je, int *excpt, protect_body_t body, va_list *args); +#endif PERL_CALLCONV void Perl_reginitcolors(pTHX); PERL_CALLCONV char* Perl_sv_2pv_nolen(pTHX_ SV* sv); PERL_CALLCONV char* Perl_sv_2pvutf8_nolen(pTHX_ SV* sv); @@ -780,6 +887,10 @@ PERL_CALLCONV char* Perl_sv_2pvbyte_nolen(pTHX_ SV* sv); PERL_CALLCONV char* Perl_sv_pv(pTHX_ SV *sv); PERL_CALLCONV char* Perl_sv_pvutf8(pTHX_ SV *sv); PERL_CALLCONV char* Perl_sv_pvbyte(pTHX_ SV *sv); +PERL_CALLCONV void Perl_sv_utf8_upgrade(pTHX_ SV *sv); +PERL_CALLCONV bool Perl_sv_utf8_downgrade(pTHX_ SV *sv, bool fail_ok); +PERL_CALLCONV void Perl_sv_utf8_encode(pTHX_ SV *sv); +PERL_CALLCONV bool Perl_sv_utf8_decode(pTHX_ SV *sv); PERL_CALLCONV void Perl_sv_force_normal(pTHX_ SV *sv); PERL_CALLCONV void Perl_tmps_grow(pTHX_ I32 n); PERL_CALLCONV SV* Perl_sv_rvweaken(pTHX_ SV *sv); @@ -865,6 +976,7 @@ STATIC OP* S_too_few_arguments(pTHX_ OP *o, char* name); STATIC OP* S_too_many_arguments(pTHX_ OP *o, char* name); STATIC void S_op_clear(pTHX_ OP* o); STATIC void S_null(pTHX_ OP* o); +STATIC PADOFFSET S_pad_addlex(pTHX_ SV* name); STATIC PADOFFSET S_pad_findlex(pTHX_ char* name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 saweval, U32 flags); STATIC OP* S_newDEFSVOP(pTHX); STATIC OP* S_new_logop(pTHX_ I32 type, I32 flags, OP **firstp, OP **otherp); @@ -901,11 +1013,16 @@ STATIC void S_validate_suid(pTHX_ char *, char*, int); # if defined(IAMSUID) STATIC int S_fd_on_nosuid_fs(pTHX_ int fd); # endif -STATIC void* S_parse_body(pTHX_ va_list args); -STATIC void* S_run_body(pTHX_ va_list args); -STATIC void* S_call_body(pTHX_ va_list args); -STATIC void S_call_xbody(pTHX_ OP *myop, int is_eval); -STATIC void* S_call_list_body(pTHX_ va_list args); +STATIC void* S_parse_body(pTHX_ char **env, XSINIT_t xsinit); +STATIC void* S_run_body(pTHX_ I32 oldscope); +STATIC void S_call_body(pTHX_ OP *myop, int is_eval); +STATIC void* S_call_list_body(pTHX_ CV *cv); +#if defined(PERL_FLEXIBLE_EXCEPTIONS) +STATIC void* S_vparse_body(pTHX_ va_list args); +STATIC void* S_vrun_body(pTHX_ va_list args); +STATIC void* S_vcall_body(pTHX_ va_list args); +STATIC void* S_vcall_list_body(pTHX_ va_list args); +#endif # if defined(USE_THREADS) STATIC struct perl_thread * S_init_main_thread(pTHX); # endif @@ -922,7 +1039,10 @@ STATIC int S_div128(pTHX_ SV *pnum, bool *done); #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) STATIC OP* S_docatch(pTHX_ OP *o); -STATIC void* S_docatch_body(pTHX_ va_list args); +STATIC void* S_docatch_body(pTHX); +#if defined(PERL_FLEXIBLE_EXCEPTIONS) +STATIC void* S_vdocatch_body(pTHX_ va_list args); +#endif STATIC OP* S_dofindlabel(pTHX_ OP *o, char *label, OP **opstack, OP **oplimit); STATIC void S_doparseform(pTHX_ SV *sv); STATIC I32 S_dopoptoeval(pTHX_ I32 startingblock); @@ -1049,12 +1169,6 @@ STATIC void S_del_xrv(pTHX_ XRV* p); STATIC void S_sv_unglob(pTHX_ SV* sv); STATIC void S_not_a_number(pTHX_ SV *sv); STATIC void S_visit(pTHX_ SVFUNC_t f); -# if defined(PURIFY) -STATIC void S_reg_add(pTHX_ SV *sv); -STATIC void S_reg_remove(pTHX_ SV *sv); -# else -STATIC void* S_my_safemalloc(MEM_SIZE size); -# endif STATIC void S_sv_add_backref(pTHX_ SV *tsv, SV *sv); STATIC void S_sv_del_backref(pTHX_ SV *sv); # if defined(DEBUGGING)