This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
sv_2pv_nolen, sv_2pvbyte_nolen and sv_2pvutf8_nolen can all be replaced
[perl5.git] / proto.h
diff --git a/proto.h b/proto.h
index b7d8918..a932e61 100644 (file)
--- a/proto.h
+++ b/proto.h
 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);
+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)
+                       __attribute__nonnull__(1)
+                       __attribute__nonnull__(2)
+                       __attribute__nonnull__(3)
+                       __attribute__nonnull__(4)
+                       __attribute__nonnull__(5)
+                       __attribute__nonnull__(6)
+                       __attribute__nonnull__(7)
+                       __attribute__nonnull__(8)
+                       __attribute__nonnull__(9);
+
 #endif
 PERL_CALLCONV PerlInterpreter* perl_alloc(void);
 PERL_CALLCONV void     perl_construct(PerlInterpreter* interp)
@@ -34,14 +44,29 @@ PERL_CALLCONV void  perl_free(PerlInterpreter* interp)
 PERL_CALLCONV int      perl_run(PerlInterpreter* interp)
                        __attribute__nonnull__(1);
 
-PERL_CALLCONV int      perl_parse(PerlInterpreter* interp, XSINIT_t xsinit, int argc, char** argv, char** env);
+PERL_CALLCONV int      perl_parse(PerlInterpreter* interp, XSINIT_t xsinit, int argc, char** argv, char** env)
+                       __attribute__nonnull__(1);
+
 PERL_CALLCONV bool     Perl_doing_taint(int argc, char** argv, char** env)
                        __attribute__warn_unused_result__;
 
 #if defined(USE_ITHREADS)
-PERL_CALLCONV PerlInterpreter* perl_clone(PerlInterpreter* interp, UV flags);
+PERL_CALLCONV PerlInterpreter* perl_clone(PerlInterpreter* interp, UV flags)
+                       __attribute__nonnull__(1);
+
 #  if defined(PERL_IMPLICIT_SYS)
-PERL_CALLCONV PerlInterpreter* perl_clone_using(PerlInterpreter *interp, UV flags, 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);
+PERL_CALLCONV PerlInterpreter* perl_clone_using(PerlInterpreter *interp, UV flags, 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)
+                       __attribute__nonnull__(1)
+                       __attribute__nonnull__(3)
+                       __attribute__nonnull__(4)
+                       __attribute__nonnull__(5)
+                       __attribute__nonnull__(6)
+                       __attribute__nonnull__(7)
+                       __attribute__nonnull__(8)
+                       __attribute__nonnull__(9)
+                       __attribute__nonnull__(10)
+                       __attribute__nonnull__(11);
+
 #  endif
 #endif
 
@@ -60,7 +85,8 @@ PERL_CALLCONV Malloc_t        Perl_realloc(Malloc_t where, MEM_SIZE nbytes)
 PERL_CALLCONV Free_t   Perl_mfree(Malloc_t where);
 #if defined(MYMALLOC)
 PERL_CALLCONV MEM_SIZE Perl_malloced_size(void *p)
-                       __attribute__warn_unused_result__;
+                       __attribute__warn_unused_result__
+                       __attribute__nonnull__(1);
 
 #endif
 
@@ -145,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__;
@@ -188,12 +213,14 @@ PERL_CALLCONV void        Perl_croak(pTHX_ const char* pat, ...)
                        __attribute__format__(__printf__,pTHX_1,pTHX_2);
 
 PERL_CALLCONV void     Perl_vcroak(pTHX_ const char* pat, va_list* args)
-                       __attribute__noreturn__;
+                       __attribute__noreturn__
+                       __attribute__nonnull__(pTHX_1);
 
 #if defined(PERL_IMPLICIT_CONTEXT)
 PERL_CALLCONV void     Perl_croak_nocontext(const char* pat, ...)
                        __attribute__noreturn__
-                       __attribute__format__(__printf__,1,2);
+                       __attribute__format__(__printf__,1,2)
+                       __attribute__nonnull__(1);
 
 PERL_CALLCONV OP*      Perl_die_nocontext(const char* pat, ...)
                        __attribute__format__(__printf__,1,2)
@@ -229,19 +256,23 @@ PERL_CALLCONV SV* Perl_newSVpvf_nocontext(const char* pat, ...)
 
 PERL_CALLCONV void     Perl_sv_catpvf_nocontext(SV* sv, const char* pat, ...)
                        __attribute__format__(__printf__,2,3)
-                       __attribute__nonnull__(1);
+                       __attribute__nonnull__(1)
+                       __attribute__nonnull__(2);
 
 PERL_CALLCONV void     Perl_sv_setpvf_nocontext(SV* sv, const char* pat, ...)
                        __attribute__format__(__printf__,2,3)
-                       __attribute__nonnull__(1);
+                       __attribute__nonnull__(1)
+                       __attribute__nonnull__(2);
 
 PERL_CALLCONV void     Perl_sv_catpvf_mg_nocontext(SV* sv, const char* pat, ...)
                        __attribute__format__(__printf__,2,3)
-                       __attribute__nonnull__(1);
+                       __attribute__nonnull__(1)
+                       __attribute__nonnull__(2);
 
 PERL_CALLCONV void     Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...)
                        __attribute__format__(__printf__,2,3)
-                       __attribute__nonnull__(1);
+                       __attribute__nonnull__(1)
+                       __attribute__nonnull__(2);
 
 PERL_CALLCONV int      Perl_fprintf_nocontext(PerlIO* stream, const char* fmt, ...)
                        __attribute__format__(__printf__,2,3)
@@ -332,9 +363,7 @@ 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)
                        __attribute__nonnull__(pTHX_2)
@@ -360,7 +389,7 @@ PERL_CALLCONV bool  Perl_do_eof(pTHX_ GV* gv)
 PERL_CALLCONV bool     Perl_do_exec(pTHX_ const char* cmd)
                        __attribute__nonnull__(pTHX_1);
 
-#if defined(WIN32) || defined(SYMBIAN)
+#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)
@@ -380,12 +409,30 @@ PERL_CALLCONV bool        Perl_do_exec3(pTHX_ const char* cmd, int fd, int flag)
 #endif
 PERL_CALLCONV void     Perl_do_execfree(pTHX);
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
-PERL_CALLCONV I32      Perl_do_ipcctl(pTHX_ I32 optype, SV** mark, SV** sp);
-PERL_CALLCONV I32      Perl_do_ipcget(pTHX_ I32 optype, SV** mark, SV** sp);
-PERL_CALLCONV I32      Perl_do_msgrcv(pTHX_ SV** mark, SV** sp);
-PERL_CALLCONV I32      Perl_do_msgsnd(pTHX_ SV** mark, SV** sp);
-PERL_CALLCONV I32      Perl_do_semop(pTHX_ SV** mark, SV** sp);
-PERL_CALLCONV I32      Perl_do_shmio(pTHX_ I32 optype, SV** mark, SV** sp);
+PERL_CALLCONV I32      Perl_do_ipcctl(pTHX_ I32 optype, SV** mark, SV** sp)
+                       __attribute__nonnull__(pTHX_2)
+                       __attribute__nonnull__(pTHX_3);
+
+PERL_CALLCONV I32      Perl_do_ipcget(pTHX_ I32 optype, SV** mark, SV** sp)
+                       __attribute__nonnull__(pTHX_2)
+                       __attribute__nonnull__(pTHX_3);
+
+PERL_CALLCONV I32      Perl_do_msgrcv(pTHX_ SV** mark, SV** sp)
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2);
+
+PERL_CALLCONV I32      Perl_do_msgsnd(pTHX_ SV** mark, SV** sp)
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2);
+
+PERL_CALLCONV I32      Perl_do_semop(pTHX_ SV** mark, SV** sp)
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2);
+
+PERL_CALLCONV I32      Perl_do_shmio(pTHX_ I32 optype, SV** mark, SV** sp)
+                       __attribute__nonnull__(pTHX_2)
+                       __attribute__nonnull__(pTHX_3);
+
 #endif
 PERL_CALLCONV void     Perl_do_join(pTHX_ SV* sv, SV* del, SV** mark, SV** sp)
                        __attribute__nonnull__(pTHX_1)
@@ -445,7 +492,7 @@ PERL_CALLCONV void  Perl_do_vop(pTHX_ I32 optype, SV* sv, SV* left, SV* right)
                        __attribute__nonnull__(pTHX_3)
                        __attribute__nonnull__(pTHX_4);
 
-PERL_CALLCONV OP*      Perl_dofile(pTHX_ OP* term)
+PERL_CALLCONV OP*      Perl_dofile(pTHX_ OP* term, I32 force_builtin)
                        __attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV I32      Perl_dowantarray(pTHX)
@@ -483,7 +530,9 @@ PERL_CALLCONV char* Perl_fbm_instr(pTHX_ unsigned char* big, unsigned char* bige
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3);
 
-PERL_CALLCONV char*    Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char **search_ext, I32 flags);
+PERL_CALLCONV char*    Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char *const *const search_ext, I32 flags)
+                       __attribute__nonnull__(pTHX_1);
+
 PERL_CALLCONV OP*      Perl_force_list(pTHX_ OP* arg);
 PERL_CALLCONV OP*      Perl_fold_constants(pTHX_ OP* arg)
                        __attribute__nonnull__(pTHX_1);
@@ -536,10 +585,18 @@ PERL_CALLCONV void        Perl_gv_efullname4(pTHX_ SV* sv, const GV* gv, const char* pr
 PERL_CALLCONV GV*      Perl_gv_fetchfile(pTHX_ const char* name)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV GV*      Perl_gv_fetchmeth(pTHX_ HV* stash, const char* name, STRLEN len, I32 level);
-PERL_CALLCONV GV*      Perl_gv_fetchmeth_autoload(pTHX_ HV* stash, const char* name, STRLEN len, I32 level);
-PERL_CALLCONV GV*      Perl_gv_fetchmethod(pTHX_ HV* stash, const char* name);
-PERL_CALLCONV GV*      Perl_gv_fetchmethod_autoload(pTHX_ HV* stash, const char* name, I32 autoload);
+PERL_CALLCONV GV*      Perl_gv_fetchmeth(pTHX_ HV* stash, const char* name, STRLEN len, I32 level)
+                       __attribute__nonnull__(pTHX_2);
+
+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_autoload(pTHX_ HV* stash, const char* name, I32 autoload)
+                       __attribute__nonnull__(pTHX_2);
+
 PERL_CALLCONV GV*      Perl_gv_fetchpv(pTHX_ const char* name, I32 add, I32 sv_type)
                        __attribute__nonnull__(pTHX_1);
 
@@ -627,7 +684,9 @@ 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);
+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);
 PERL_CALLCONV SV**     Perl_hv_store_flags(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash, int flags);
@@ -951,7 +1010,9 @@ PERL_CALLCONV bool Perl_grok_numeric_radix(pTHX_ const char **sp, const char *se
                        __attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV UV       Perl_grok_oct(pTHX_ const char* start, STRLEN* len_p, I32* flags, NV *result)
-                       __attribute__nonnull__(pTHX_1);
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2)
+                       __attribute__nonnull__(pTHX_3);
 
 PERL_CALLCONV int      Perl_magic_clearenv(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_1)
@@ -1553,9 +1614,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);
 
@@ -1590,7 +1649,9 @@ PERL_CALLCONV PerlIO*     Perl_start_glob(pTHX_ SV* pattern, IO *io)
 PERL_CALLCONV void     Perl_reentrant_size(pTHX);
 PERL_CALLCONV void     Perl_reentrant_init(pTHX);
 PERL_CALLCONV void     Perl_reentrant_free(pTHX);
-PERL_CALLCONV void*    Perl_reentrant_retry(const char*, ...);
+PERL_CALLCONV void*    Perl_reentrant_retry(const char*, ...)
+                       __attribute__nonnull__(1);
+
 #endif
 PERL_CALLCONV void     Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr);
 PERL_CALLCONV I32      Perl_call_argv(pTHX_ const char* sub_name, I32 flags, char** argv)
@@ -1607,6 +1668,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);
 
@@ -1653,7 +1717,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);
 
@@ -1669,7 +1735,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);
@@ -1702,7 +1768,8 @@ PERL_CALLCONV I32 Perl_regexec_flags(pTHX_ regexp* prog, char* stringarg, char*
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3)
-                       __attribute__nonnull__(pTHX_4);
+                       __attribute__nonnull__(pTHX_4)
+                       __attribute__nonnull__(pTHX_6);
 
 PERL_CALLCONV regnode* Perl_regnext(pTHX_ regnode* p)
                        __attribute__warn_unused_result__
@@ -1748,13 +1815,11 @@ PERL_CALLCONV I32       Perl_same_dirent(pTHX_ const char* a, const char* b)
 #endif
 PERL_CALLCONV char*    Perl_savepv(pTHX_ const char* pv)
                        __attribute__malloc__
-                       __attribute__warn_unused_result__
-                       __attribute__nonnull__(pTHX_1);
+                       __attribute__warn_unused_result__;
 
 PERL_CALLCONV char*    Perl_savepvn(pTHX_ const char* pv, I32 len)
                        __attribute__malloc__
-                       __attribute__warn_unused_result__
-                       __attribute__nonnull__(pTHX_1);
+                       __attribute__warn_unused_result__;
 
 PERL_CALLCONV char*    Perl_savesharedpv(pTHX_ const char* pv)
                        __attribute__malloc__
@@ -1788,7 +1853,9 @@ PERL_CALLCONV void        Perl_save_delete(pTHX_ HV* hv, char* key, I32 klen)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV void     Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p);
+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);
 PERL_CALLCONV void     Perl_save_freesv(pTHX_ SV* sv);
 PERL_CALLCONV void     Perl_save_freeop(pTHX_ OP* o);
@@ -1898,7 +1965,9 @@ PERL_CALLCONV char*       Perl_screaminstr(pTHX_ SV *bigstr, SV *littlestr, I32 start_
                        __attribute__nonnull__(pTHX_5);
 
 #if !defined(VMS)
-PERL_CALLCONV I32      Perl_setenv_getix(pTHX_ const char* nam);
+PERL_CALLCONV I32      Perl_setenv_getix(pTHX_ const char* nam)
+                       __attribute__nonnull__(pTHX_1);
+
 #endif
 PERL_CALLCONV void     Perl_setdefout(pTHX_ GV* gv);
 PERL_CALLCONV HEK*     Perl_share_hek(pTHX_ const char* str, I32 len, U32 hash)
@@ -1915,9 +1984,7 @@ PERL_CALLCONV SV**        Perl_stack_grow(pTHX_ SV** sp, SV**p, int n)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV I32      Perl_start_subparse(pTHX_ I32 is_format, U32 flags)
-                       __attribute__warn_unused_result__;
-
+PERL_CALLCONV I32      Perl_start_subparse(pTHX_ I32 is_format, U32 flags);
 PERL_CALLCONV void     Perl_sub_crush_depth(pTHX_ CV* cv)
                        __attribute__nonnull__(pTHX_1);
 
@@ -1937,9 +2004,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);
 
@@ -2058,10 +2123,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);
@@ -2186,8 +2248,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__
@@ -2196,8 +2258,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);
@@ -2239,7 +2301,9 @@ PERL_CALLCONV void        Perl_taint_proper(pTHX_ const char* f, const char* s)
 PERL_CALLCONV UV       Perl_to_utf8_case(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, SV **swashp, const char *normal, const char *special)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2)
-                       __attribute__nonnull__(pTHX_4);
+                       __attribute__nonnull__(pTHX_4)
+                       __attribute__nonnull__(pTHX_5)
+                       __attribute__nonnull__(pTHX_6);
 
 PERL_CALLCONV UV       Perl_to_utf8_lower(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp)
                        __attribute__nonnull__(pTHX_1)
@@ -2342,9 +2406,14 @@ PERL_CALLCONV U8*        Perl_uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
 PERL_CALLCONV U8*      Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV char*    Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV flags);
+PERL_CALLCONV char*    Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV flags)
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2);
+
 PERL_CALLCONV char*    Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim, UV flags)
-                       __attribute__warn_unused_result__;
+                       __attribute__warn_unused_result__
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV void     Perl_vivify_defelem(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1);
@@ -2355,7 +2424,9 @@ 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)
                        __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV U32      Perl_parse_unicode_opts(pTHX_ const char **popt);
+PERL_CALLCONV U32      Perl_parse_unicode_opts(pTHX_ const char **popt)
+                       __attribute__nonnull__(pTHX_1);
+
 PERL_CALLCONV U32      Perl_seed(pTHX);
 PERL_CALLCONV UV       Perl_get_hash_seed(pTHX)
                        __attribute__warn_unused_result__;
@@ -2398,7 +2469,6 @@ PERL_CALLCONV void        Perl_dump_mstats(pTHX_ char* s)
                        __attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV int      Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level)
-                       __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1);
 
 #endif
@@ -2418,7 +2488,9 @@ PERL_CALLCONV Free_t      Perl_safesysfree(Malloc_t where);
 #if defined(PERL_GLOBAL_STRUCT)
 PERL_CALLCONV struct perl_vars *       Perl_GetVars(pTHX);
 PERL_CALLCONV struct perl_vars*        Perl_init_global_struct(pTHX);
-PERL_CALLCONV void     Perl_free_global_struct(pTHX_ struct perl_vars*);
+PERL_CALLCONV void     Perl_free_global_struct(pTHX_ struct perl_vars *plvarsp)
+                       __attribute__nonnull__(pTHX_1);
+
 #endif
 PERL_CALLCONV int      Perl_runops_standard(pTHX);
 PERL_CALLCONV int      Perl_runops_debug(pTHX);
@@ -2522,17 +2594,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__
@@ -2558,8 +2630,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);
@@ -3583,8 +3655,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);
@@ -3983,6 +4054,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: