X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=2050389066d47a749e7a166821c6cadfe9128e52;hb=8c654ff2610478421e870f364dd74578fcc21373;hp=9996bf3bfd0edc09dd196148362d19e3b5fb4dcc;hpb=0b1558d16cef0eed0293ca2293a1169f013e7e06;p=p5sagit%2Fp5-mst-13.2.git diff --git a/proto.h b/proto.h index 9996bf3..2050389 100644 --- a/proto.h +++ b/proto.h @@ -171,8 +171,7 @@ PERL_CALLCONV OP* Perl_bind_match(pTHX_ I32 type, OP* left, OP* pat) __attribute__nonnull__(pTHX_3); PERL_CALLCONV OP* Perl_block_end(pTHX_ I32 floor, OP* seq) - __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_2); + __attribute__warn_unused_result__; PERL_CALLCONV I32 Perl_block_gimme(pTHX) __attribute__warn_unused_result__; @@ -211,8 +210,7 @@ PERL_CALLCONV OP* Perl_convert(pTHX_ I32 optype, I32 flags, OP* o) PERL_CALLCONV void Perl_croak(pTHX_ const char* pat, ...) __attribute__noreturn__ - __attribute__format__(__printf__,pTHX_1,pTHX_2) - __attribute__nonnull__(pTHX_1); + __attribute__format__(__printf__,pTHX_1,pTHX_2); PERL_CALLCONV void Perl_vcroak(pTHX_ const char* pat, va_list* args) __attribute__noreturn__ @@ -365,13 +363,11 @@ PERL_CALLCONV OP* Perl_die(pTHX_ const char* pat, ...) __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_ const char* message, STRLEN msglen) - __attribute__nonnull__(pTHX_1); - +PERL_CALLCONV OP* Perl_die_where(pTHX_ const char* message, STRLEN msglen); PERL_CALLCONV void Perl_dounwind(pTHX_ I32 cxix); -PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp) +/* PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp) __attribute__nonnull__(pTHX_2) - __attribute__nonnull__(pTHX_3); + __attribute__nonnull__(pTHX_3); */ PERL_CALLCONV bool Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int flag) __attribute__nonnull__(pTHX_2) @@ -390,10 +386,18 @@ PERL_CALLCONV bool Perl_do_close(pTHX_ GV* gv, bool not_implicit) PERL_CALLCONV bool Perl_do_eof(pTHX_ GV* gv) __attribute__nonnull__(pTHX_1); + +#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION +/* PERL_CALLCONV bool Perl_do_exec(pTHX_ const char* cmd) + __attribute__nonnull__(pTHX_1); */ + +#else PERL_CALLCONV bool Perl_do_exec(pTHX_ const char* cmd) __attribute__nonnull__(pTHX_1); -#if defined(WIN32) || defined(SYMBIAN) +#endif + +#if defined(WIN32) || defined(__SYMBIAN32__) PERL_CALLCONV int Perl_do_aspawn(pTHX_ SV* really, SV** mark, SV** sp) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) @@ -445,9 +449,9 @@ PERL_CALLCONV void Perl_do_join(pTHX_ SV* sv, SV* del, SV** mark, SV** sp) __attribute__nonnull__(pTHX_4); PERL_CALLCONV OP* Perl_do_kv(pTHX); -PERL_CALLCONV bool Perl_do_open(pTHX_ GV* gv, const char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp) +/* PERL_CALLCONV bool Perl_do_open(pTHX_ GV* gv, const char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp) __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); + __attribute__nonnull__(pTHX_2); */ PERL_CALLCONV bool Perl_do_open9(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV *svs, I32 num) __attribute__nonnull__(pTHX_1) @@ -595,8 +599,8 @@ PERL_CALLCONV GV* Perl_gv_fetchmeth(pTHX_ HV* stash, const char* name, STRLEN le PERL_CALLCONV GV* Perl_gv_fetchmeth_autoload(pTHX_ HV* stash, const char* name, STRLEN len, I32 level) __attribute__nonnull__(pTHX_2); -PERL_CALLCONV GV* Perl_gv_fetchmethod(pTHX_ HV* stash, const char* name) - __attribute__nonnull__(pTHX_2); +/* PERL_CALLCONV GV* Perl_gv_fetchmethod(pTHX_ HV* stash, const char* name) + __attribute__nonnull__(pTHX_2); */ PERL_CALLCONV GV* Perl_gv_fetchmethod_autoload(pTHX_ HV* stash, const char* name, I32 autoload) __attribute__nonnull__(pTHX_2); @@ -666,9 +670,9 @@ PERL_CALLCONV SV* Perl_hv_iterkeysv(pTHX_ HE* entry) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -PERL_CALLCONV HE* Perl_hv_iternext(pTHX_ HV* tb) +/* PERL_CALLCONV HE* Perl_hv_iternext(pTHX_ HV* tb) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV SV* Perl_hv_iternextsv(pTHX_ HV* hv, char** key, I32* retlen) __attribute__warn_unused_result__ @@ -688,8 +692,8 @@ PERL_CALLCONV SV* Perl_hv_iterval(pTHX_ HV* tb, HE* entry) PERL_CALLCONV void Perl_hv_ksplit(pTHX_ HV* hv, IV newmax) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV SV** Perl_hv_store(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash); PERL_CALLCONV HE* Perl_hv_store_ent(pTHX_ HV* tb, SV* key, SV* val, U32 hash); @@ -887,8 +891,8 @@ PERL_CALLCONV STRLEN Perl_is_utf8_char(pTHX_ const U8 *p) PERL_CALLCONV bool Perl_is_utf8_string(pTHX_ const U8 *s, STRLEN len) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV bool Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **p) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV bool Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **p) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV bool Perl_is_utf8_string_loclen(pTHX_ const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) __attribute__nonnull__(pTHX_1); @@ -1618,9 +1622,7 @@ PERL_CALLCONV OP* Perl_oopsCV(pTHX_ OP* o) __attribute__noreturn__ __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_op_free(pTHX_ OP* arg) - __attribute__nonnull__(pTHX_1); - +PERL_CALLCONV void Perl_op_free(pTHX_ OP* arg); PERL_CALLCONV void Perl_package(pTHX_ OP* o) __attribute__nonnull__(pTHX_1); @@ -1674,6 +1676,9 @@ PERL_CALLCONV I32 Perl_call_sv(pTHX_ SV* sv, I32 flags) __attribute__nonnull__(pTHX_1); PERL_CALLCONV void Perl_despatch_signals(pTHX); +PERL_CALLCONV OP * Perl_doref(pTHX_ OP *o, I32 type, bool set_op_ref) + __attribute__nonnull__(pTHX_1); + PERL_CALLCONV SV* Perl_eval_pv(pTHX_ const char* p, I32 croak_on_error) __attribute__nonnull__(pTHX_1); @@ -1720,7 +1725,9 @@ PERL_CALLCONV void Perl_packlist(pTHX_ SV *cat, const char *pat, const char *pat __attribute__nonnull__(pTHX_4) __attribute__nonnull__(pTHX_5); +#ifdef PERL_USES_PL_PIDSTATUS PERL_CALLCONV void Perl_pidgone(pTHX_ Pid_t pid, int status); +#endif PERL_CALLCONV void Perl_pmflag(pTHX_ U32* pmfl, int ch) __attribute__nonnull__(pTHX_1); @@ -1736,7 +1743,7 @@ PERL_CALLCONV OP* Perl_pmtrans(pTHX_ OP* o, OP* expr, OP* repl) PERL_CALLCONV void Perl_pop_scope(pTHX); PERL_CALLCONV OP* Perl_prepend_elem(pTHX_ I32 optype, OP* head, OP* tail); PERL_CALLCONV void Perl_push_scope(pTHX); -PERL_CALLCONV OP* Perl_ref(pTHX_ OP* o, I32 type); +/* PERL_CALLCONV OP* ref(pTHX_ OP* o, I32 type); */ PERL_CALLCONV OP* Perl_refkids(pTHX_ OP* o, I32 type); PERL_CALLCONV void Perl_regdump(pTHX_ regexp* r) __attribute__nonnull__(pTHX_1); @@ -1857,9 +1864,7 @@ PERL_CALLCONV void Perl_save_delete(pTHX_ HV* hv, char* key, I32 klen) PERL_CALLCONV void Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p) __attribute__nonnull__(pTHX_2); -PERL_CALLCONV void Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p) - __attribute__nonnull__(pTHX_2); - +PERL_CALLCONV void Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p); PERL_CALLCONV void Perl_save_freesv(pTHX_ SV* sv); PERL_CALLCONV void Perl_save_freeop(pTHX_ OP* o); PERL_CALLCONV void Perl_save_freepv(pTHX_ char* pv); @@ -2007,9 +2012,7 @@ PERL_CALLCONV IO* Perl_sv_2io(pTHX_ SV* sv) PERL_CALLCONV IV Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV SV* Perl_sv_2mortal(pTHX_ SV* sv) - __attribute__nonnull__(pTHX_1); - +PERL_CALLCONV SV* Perl_sv_2mortal(pTHX_ SV* sv); PERL_CALLCONV NV Perl_sv_2nv(pTHX_ SV* sv) __attribute__nonnull__(pTHX_1); @@ -2128,10 +2131,7 @@ PERL_CALLCONV bool Perl_sv_derived_from(pTHX_ SV* sv, const char* name) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -PERL_CALLCONV I32 Perl_sv_eq(pTHX_ SV* sv1, SV* sv2) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); - +PERL_CALLCONV I32 Perl_sv_eq(pTHX_ SV* sv1, SV* sv2); PERL_CALLCONV void Perl_sv_free(pTHX_ SV* sv); PERL_CALLCONV void Perl_sv_free2(pTHX_ SV* sv) __attribute__nonnull__(pTHX_1); @@ -2256,8 +2256,8 @@ PERL_CALLCONV void Perl_sv_setpvn(pTHX_ SV* sv, const char* ptr, STRLEN len) /* PERL_CALLCONV void sv_setsv(pTHX_ SV* dsv, SV* ssv) __attribute__nonnull__(pTHX_1); */ -PERL_CALLCONV void Perl_sv_taint(pTHX_ SV* sv) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void sv_taint(pTHX_ SV* sv) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV bool Perl_sv_tainted(pTHX_ SV* sv) __attribute__warn_unused_result__ @@ -2266,8 +2266,8 @@ PERL_CALLCONV bool Perl_sv_tainted(pTHX_ SV* sv) PERL_CALLCONV int Perl_sv_unmagic(pTHX_ SV* sv, int type) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_sv_unref(pTHX_ SV* sv) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void Perl_sv_unref(pTHX_ SV* sv) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV void Perl_sv_unref_flags(pTHX_ SV* sv, U32 flags) __attribute__nonnull__(pTHX_1); @@ -2396,17 +2396,33 @@ PERL_CALLCONV UV Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) PERL_CALLCONV UV Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) __attribute__nonnull__(pTHX_1); + +#ifdef EBCDIC PERL_CALLCONV UV Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) __attribute__nonnull__(pTHX_1); +#else +/* PERL_CALLCONV UV Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) + __attribute__nonnull__(pTHX_1); */ + +#endif + PERL_CALLCONV UV Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) __attribute__nonnull__(pTHX_1); + +#ifdef EBCDIC PERL_CALLCONV U8* Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV U8* Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) - __attribute__nonnull__(pTHX_1); +#else +/* PERL_CALLCONV U8* Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) + __attribute__nonnull__(pTHX_1); */ + +#endif + +/* PERL_CALLCONV U8* Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV U8* Perl_uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) __attribute__nonnull__(pTHX_1); @@ -2515,12 +2531,12 @@ PERL_CALLCONV void Perl_sv_catpv_mg(pTHX_ SV *sv, const char *ptr) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -PERL_CALLCONV void Perl_sv_catpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len) +/* PERL_CALLCONV void Perl_sv_catpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len) __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); + __attribute__nonnull__(pTHX_2); */ -PERL_CALLCONV void Perl_sv_catsv_mg(pTHX_ SV *dstr, SV *sstr) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void Perl_sv_catsv_mg(pTHX_ SV *dstr, SV *sstr) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV void Perl_sv_setpvf_mg(pTHX_ SV *sv, const char* pat, ...) __attribute__format__(__printf__,pTHX_2,pTHX_3) @@ -2602,17 +2618,17 @@ PERL_CALLCONV void Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 ne PERL_CALLCONV void Perl_magic_dump(pTHX_ const MAGIC *mg); PERL_CALLCONV void Perl_reginitcolors(pTHX); -PERL_CALLCONV char* Perl_sv_2pv_nolen(pTHX_ SV* sv) +/* PERL_CALLCONV char* Perl_sv_2pv_nolen(pTHX_ SV* sv) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(pTHX_1); */ -PERL_CALLCONV char* Perl_sv_2pvutf8_nolen(pTHX_ SV* sv) +/* PERL_CALLCONV char* Perl_sv_2pvutf8_nolen(pTHX_ SV* sv) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(pTHX_1); */ -PERL_CALLCONV char* Perl_sv_2pvbyte_nolen(pTHX_ SV* sv) +/* PERL_CALLCONV char* Perl_sv_2pvbyte_nolen(pTHX_ SV* sv) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(pTHX_1); */ /* PERL_CALLCONV char* sv_pv(pTHX_ SV *sv) __attribute__warn_unused_result__ @@ -2638,8 +2654,8 @@ PERL_CALLCONV void Perl_sv_utf8_encode(pTHX_ SV *sv) PERL_CALLCONV bool Perl_sv_utf8_decode(pTHX_ SV *sv) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_sv_force_normal(pTHX_ SV *sv) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void Perl_sv_force_normal(pTHX_ SV *sv) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV void Perl_sv_force_normal_flags(pTHX_ SV *sv, U32 flags) __attribute__nonnull__(pTHX_1); @@ -2774,8 +2790,8 @@ PERL_CALLCONV int Perl_sv_release_IVX(pTHX_ SV *sv) #endif PERL_CALLCONV void Perl_sv_nosharing(pTHX_ SV *); -PERL_CALLCONV void Perl_sv_nolocking(pTHX_ SV *); -PERL_CALLCONV void Perl_sv_nounlocking(pTHX_ SV *); +/* PERL_CALLCONV void Perl_sv_nolocking(pTHX_ SV *); */ +/* PERL_CALLCONV void Perl_sv_nounlocking(pTHX_ SV *); */ PERL_CALLCONV int Perl_nothreadhook(pTHX); END_EXTERN_C @@ -3663,8 +3679,7 @@ STATIC void S_incline(pTHX_ char *s) __attribute__nonnull__(pTHX_1); STATIC int S_intuit_method(pTHX_ char *s, GV *gv) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); + __attribute__nonnull__(pTHX_1); STATIC int S_intuit_more(pTHX_ char *s) __attribute__nonnull__(pTHX_1); @@ -3706,9 +3721,7 @@ STATIC SV* S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, SV * __attribute__nonnull__(pTHX_4); # if defined(DEBUGGING) -STATIC int S_tokereport(pTHX_ const char *s, I32 rv) - __attribute__nonnull__(pTHX_1); - +STATIC int S_tokereport(pTHX_ I32 rv); # endif STATIC int S_ao(pTHX_ int toketype); STATIC void S_depcom(pTHX); @@ -4063,6 +4076,13 @@ PERL_CALLCONV void Perl_offer_nice_chunk(pTHX_ void *chunk, U32 chunk_size) __attribute__nonnull__(pTHX_1); +#ifndef SPRINTF_RETURNS_STRLEN +PERL_CALLCONV int Perl_my_sprintf(char *buffer, const char *pat, ...) + __attribute__nonnull__(1) + __attribute__nonnull__(2); + +#endif + END_EXTERN_C /* * ex: set ts=8 sts=4 sw=4 noet: