From: Rafael Garcia-Suarez Date: Thu, 9 Feb 2006 17:49:18 +0000 (+0000) Subject: Really regenerate headers X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=44af46eeddcebf8498b872cce52b93562332def3;p=p5sagit%2Fp5-mst-13.2.git Really regenerate headers p4raw-id: //depot/perl@27138 --- diff --git a/embed.h b/embed.h index e586939..24c85cd 100644 --- a/embed.h +++ b/embed.h @@ -1361,10 +1361,21 @@ #define stringify_regexp S_stringify_regexp #define F0convert S_F0convert #endif -#if defined(PERL_OLD_COPY_ON_WRITE) +# if defined(PERL_OLD_COPY_ON_WRITE) #ifdef PERL_CORE #define sv_release_COW S_sv_release_COW #endif +# endif +#ifdef PERL_CORE +#define more_sv S_more_sv +#define more_bodies S_more_bodies +#define sv_2iuv_common S_sv_2iuv_common +#define glob_assign_glob S_glob_assign_glob +#define glob_assign_ref S_glob_assign_ref +#define ptr_table_find S_ptr_table_find +#define find_hash_subscript S_find_hash_subscript +#define find_array_subscript S_find_array_subscript +#define find_uninit_var S_find_uninit_var #endif #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) @@ -3098,12 +3109,12 @@ #define hsplit(a) S_hsplit(aTHX_ a) #define hfreeentries(a) S_hfreeentries(aTHX_ a) #define new_he() S_new_he(aTHX) -#define save_hek_flags(a,b,c,d) S_save_hek_flags(aTHX_ a,b,c,d) -#define hv_magic_check(a,b,c) S_hv_magic_check(aTHX_ a,b,c) +#define save_hek_flags S_save_hek_flags +#define hv_magic_check S_hv_magic_check #define unshare_hek_or_pvn(a,b,c,d) S_unshare_hek_or_pvn(aTHX_ a,b,c,d) #define share_hek_flags(a,b,c,d) S_share_hek_flags(aTHX_ a,b,c,d) #define hv_notallowed(a,b,c,d) S_hv_notallowed(aTHX_ a,b,c,d) -#define hv_auxinit(a) S_hv_auxinit(aTHX_ a) +#define hv_auxinit S_hv_auxinit #define hv_delete_common(a,b,c,d,e,f,g) S_hv_delete_common(aTHX_ a,b,c,d,e,f,g) #define hv_fetch_common(a,b,c,d,e,f,g,h) S_hv_fetch_common(aTHX_ a,b,c,d,e,f,g,h) #endif @@ -3161,7 +3172,7 @@ #define ck_svconst(a) Perl_ck_svconst(aTHX_ a) #define ck_trunc(a) Perl_ck_trunc(aTHX_ a) #define ck_unpack(a) Perl_ck_unpack(aTHX_ a) -#define is_handle_constructor(a,b) S_is_handle_constructor(aTHX_ a,b) +#define is_handle_constructor S_is_handle_constructor #define is_list_assignment(a) S_is_list_assignment(aTHX_ a) #define cop_free(a) S_cop_free(aTHX_ a) #define modkids(a,b) S_modkids(aTHX_ a,b) @@ -3170,7 +3181,7 @@ #define new_logop(a,b,c,d) S_new_logop(aTHX_ a,b,c,d) #define simplify_sort(a) S_simplify_sort(aTHX_ a) #define gv_ename(a) S_gv_ename(aTHX_ a) -#define scalar_mod_type(a,b) S_scalar_mod_type(aTHX_ a,b) +#define scalar_mod_type S_scalar_mod_type #define my_kid(a,b,c) S_my_kid(aTHX_ a,b,c) #define dup_attrlist(a) S_dup_attrlist(aTHX_ a) #define apply_attrs(a,b,c,d) S_apply_attrs(aTHX_ a,b,c,d) @@ -3259,7 +3270,7 @@ #define doeval(a,b,c,d) S_doeval(aTHX_ a,b,c,d) #define check_type_and_open(a,b) S_check_type_and_open(aTHX_ a,b) #define doopen_pm(a,b) S_doopen_pm(aTHX_ a,b) -#define path_is_absolute(a) S_path_is_absolute(aTHX_ a) +#define path_is_absolute S_path_is_absolute #define run_user_filter(a,b,c) S_run_user_filter(aTHX_ a,b,c) #define make_matcher(a) S_make_matcher(aTHX_ a) #define matcher_matches_sv(a,b) S_matcher_matches_sv(aTHX_ a,b) @@ -3306,13 +3317,13 @@ #define regbranch(a,b,c) S_regbranch(aTHX_ a,b,c) #define reguni(a,b,c,d) S_reguni(aTHX_ a,b,c,d) #define regclass(a) S_regclass(aTHX_ a) -#define regcurly(a) S_regcurly(aTHX_ a) +#define regcurly S_regcurly #define reg_node(a,b) S_reg_node(aTHX_ a,b) #define regpiece(a,b) S_regpiece(aTHX_ a,b) #define reginsert(a,b,c) S_reginsert(aTHX_ a,b,c) #define regoptail(a,b,c) S_regoptail(aTHX_ a,b,c) #define regtail(a,b,c) S_regtail(aTHX_ a,b,c) -#define regwhite(a,b) S_regwhite(aTHX_ a,b) +#define regwhite S_regwhite #define nextchar(a) S_nextchar(aTHX_ a) #endif # ifdef DEBUGGING @@ -3323,14 +3334,14 @@ # endif #if defined(PERL_CORE) || defined(PERL_EXT) #define scan_commit(a,b) S_scan_commit(aTHX_ a,b) -#define cl_anything(a,b) S_cl_anything(aTHX_ a,b) -#define cl_is_anything(a) S_cl_is_anything(aTHX_ a) -#define cl_init(a,b) S_cl_init(aTHX_ a,b) -#define cl_init_zero(a,b) S_cl_init_zero(aTHX_ a,b) -#define cl_and(a,b) S_cl_and(aTHX_ a,b) -#define cl_or(a,b,c) S_cl_or(aTHX_ a,b,c) +#define cl_anything S_cl_anything +#define cl_is_anything S_cl_is_anything +#define cl_init S_cl_init +#define cl_init_zero S_cl_init_zero +#define cl_and S_cl_and +#define cl_or S_cl_or #define study_chunk(a,b,c,d,e,f,g) S_study_chunk(aTHX_ a,b,c,d,e,f,g) -#define add_data(a,b,c) S_add_data(aTHX_ a,b,c) +#define add_data S_add_data #endif #ifdef PERL_CORE #endif @@ -3353,9 +3364,9 @@ #define regcppop() S_regcppop(aTHX) #define cache_re(a) S_cache_re(aTHX_ a) #define reghop(a,b) S_reghop(aTHX_ a,b) -#define reghop3(a,b,c) S_reghop3(aTHX_ a,b,c) +#define reghop3 S_reghop3 #define reghopmaybe(a,b) S_reghopmaybe(aTHX_ a,b) -#define reghopmaybe3(a,b,c) S_reghopmaybe3(aTHX_ a,b,c) +#define reghopmaybe3 S_reghopmaybe3 #define find_byclass(a,b,c,d,e) S_find_byclass(aTHX_ a,b,c,d,e) #define to_utf8_substr(a) S_to_utf8_substr(aTHX_ a) #define to_byte_substr(a) S_to_byte_substr(aTHX_ a) @@ -3410,10 +3421,21 @@ #define stringify_regexp(a,b,c) S_stringify_regexp(aTHX_ a,b,c) #define F0convert S_F0convert #endif -#if defined(PERL_OLD_COPY_ON_WRITE) +# if defined(PERL_OLD_COPY_ON_WRITE) #ifdef PERL_CORE #define sv_release_COW(a,b,c,d) S_sv_release_COW(aTHX_ a,b,c,d) #endif +# endif +#ifdef PERL_CORE +#define more_sv() S_more_sv(aTHX) +#define more_bodies(a,b) S_more_bodies(aTHX_ a,b) +#define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a) +#define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c) +#define glob_assign_ref(a,b) S_glob_assign_ref(aTHX_ a,b) +#define ptr_table_find S_ptr_table_find +#define find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b) +#define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b) +#define find_uninit_var(a,b,c) S_find_uninit_var(aTHX_ a,b,c) #endif #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) @@ -3496,7 +3518,7 @@ #endif #if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define is_utf8_char_slow(a,b) S_is_utf8_char_slow(aTHX_ a,b) +#define is_utf8_char_slow S_is_utf8_char_slow #define is_utf8_common(a,b,c) S_is_utf8_common(aTHX_ a,b,c) #define swash_get(a,b,c) S_swash_get(aTHX_ a,b,c) #endif diff --git a/proto.h b/proto.h index aa4808e..99b9d01 100644 --- a/proto.h +++ b/proto.h @@ -2866,15 +2866,15 @@ STATIC HE* S_new_he(pTHX) __attribute__malloc__ __attribute__warn_unused_result__; -STATIC HEK* S_save_hek_flags(pTHX_ const char *str, I32 len, U32 hash, int flags) +STATIC HEK* S_save_hek_flags(const char *str, I32 len, U32 hash, int flags) __attribute__malloc__ __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(1); -STATIC void S_hv_magic_check(pTHX_ HV *hv, bool *needs_copy, bool *needs_store) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2) - __attribute__nonnull__(pTHX_3); +STATIC void S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store) + __attribute__nonnull__(1) + __attribute__nonnull__(2) + __attribute__nonnull__(3); STATIC void S_unshare_hek_or_pvn(pTHX_ const HEK* hek, const char* str, I32 len, U32 hash); STATIC HEK* S_share_hek_flags(pTHX_ const char* sv, I32 len, U32 hash, int flags) @@ -2886,8 +2886,9 @@ STATIC void S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, const ch __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_4); -STATIC struct xpvhv_aux* S_hv_auxinit(pTHX_ HV *hv) - __attribute__nonnull__(pTHX_1); +STATIC struct xpvhv_aux* S_hv_auxinit(HV *hv) + __attribute__warn_unused_result__ + __attribute__nonnull__(1); STATIC SV* S_hv_delete_common(pTHX_ HV* tb, SV* keysv, const char* key, STRLEN klen, int k_flags, I32 d_flags, U32 hash); STATIC HE* S_hv_fetch_common(pTHX_ HV* tb, SV* keysv, const char* key, STRLEN klen, int flags, int action, SV* val, U32 hash); @@ -3085,9 +3086,9 @@ PERL_CALLCONV OP* Perl_ck_unpack(pTHX_ OP *o) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC bool S_is_handle_constructor(pTHX_ const OP *o, I32 numargs) +STATIC bool S_is_handle_constructor(const OP *o, I32 numargs) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(1); STATIC I32 S_is_list_assignment(pTHX_ const OP *o) __attribute__warn_unused_result__; @@ -3113,8 +3114,9 @@ STATIC void S_simplify_sort(pTHX_ OP *o) STATIC const char* S_gv_ename(pTHX_ GV *gv) __attribute__nonnull__(pTHX_1); -STATIC bool S_scalar_mod_type(pTHX_ const OP *o, I32 type) - __attribute__nonnull__(pTHX_1); +STATIC bool S_scalar_mod_type(const OP *o, I32 type) + __attribute__warn_unused_result__ + __attribute__nonnull__(1); STATIC OP * S_my_kid(pTHX_ OP *o, OP *attrs, OP **imopsp) __attribute__nonnull__(pTHX_3); @@ -3336,9 +3338,9 @@ STATIC PerlIO * S_doopen_pm(pTHX_ const char *name, const char *mode) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -STATIC bool S_path_is_absolute(pTHX_ const char *name) +STATIC bool S_path_is_absolute(const char *name) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(1); STATIC I32 S_run_user_filter(pTHX_ int idx, SV *buf_sv, int maxlen) __attribute__warn_unused_result__ @@ -3457,9 +3459,9 @@ STATIC void S_reguni(pTHX_ const struct RExC_state_t *state, UV uv, char *s, STR STATIC regnode* S_regclass(pTHX_ struct RExC_state_t *state) __attribute__nonnull__(pTHX_1); -STATIC I32 S_regcurly(pTHX_ const char *) +STATIC I32 S_regcurly(const char *) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(1); STATIC regnode* S_reg_node(pTHX_ struct RExC_state_t *state, U8 op) __attribute__nonnull__(pTHX_1); @@ -3482,9 +3484,10 @@ STATIC void S_regtail(pTHX_ struct RExC_state_t *state, regnode *p, regnode *val __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_3); -STATIC char* S_regwhite(pTHX_ char *p, const char *e) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +STATIC char* S_regwhite(char *p, const char *e) + __attribute__warn_unused_result__ + __attribute__nonnull__(1) + __attribute__nonnull__(2); STATIC char* S_nextchar(pTHX_ struct RExC_state_t *state) __attribute__nonnull__(pTHX_1); @@ -3503,29 +3506,30 @@ STATIC void S_scan_commit(pTHX_ struct RExC_state_t* state, struct scan_data_t * __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -STATIC void S_cl_anything(pTHX_ struct RExC_state_t* state, struct regnode_charclass_class *cl) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +STATIC void S_cl_anything(struct RExC_state_t* state, struct regnode_charclass_class *cl) + __attribute__nonnull__(1) + __attribute__nonnull__(2); -STATIC int S_cl_is_anything(pTHX_ const struct regnode_charclass_class *cl) - __attribute__nonnull__(pTHX_1); +STATIC int S_cl_is_anything(const struct regnode_charclass_class *cl) + __attribute__warn_unused_result__ + __attribute__nonnull__(1); -STATIC void S_cl_init(pTHX_ struct RExC_state_t* state, struct regnode_charclass_class *cl) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +STATIC void S_cl_init(struct RExC_state_t* state, struct regnode_charclass_class *cl) + __attribute__nonnull__(1) + __attribute__nonnull__(2); -STATIC void S_cl_init_zero(pTHX_ struct RExC_state_t* state, struct regnode_charclass_class *cl) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +STATIC void S_cl_init_zero(struct RExC_state_t* state, struct regnode_charclass_class *cl) + __attribute__nonnull__(1) + __attribute__nonnull__(2); -STATIC void S_cl_and(pTHX_ struct regnode_charclass_class *cl, const struct regnode_charclass_class *and_with) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +STATIC void S_cl_and(struct regnode_charclass_class *cl, const struct regnode_charclass_class *and_with) + __attribute__nonnull__(1) + __attribute__nonnull__(2); -STATIC void S_cl_or(pTHX_ struct RExC_state_t* state, struct regnode_charclass_class *cl, const struct regnode_charclass_class *or_with) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2) - __attribute__nonnull__(pTHX_3); +STATIC void S_cl_or(struct RExC_state_t* state, struct regnode_charclass_class *cl, const struct regnode_charclass_class *or_with) + __attribute__nonnull__(1) + __attribute__nonnull__(2) + __attribute__nonnull__(3); STATIC I32 S_study_chunk(pTHX_ struct RExC_state_t* state, regnode **scanp, I32 *deltap, regnode *last, struct scan_data_t *data, U32 flags, U32 depth) __attribute__nonnull__(pTHX_1) @@ -3533,9 +3537,10 @@ STATIC I32 S_study_chunk(pTHX_ struct RExC_state_t* state, regnode **scanp, I32 __attribute__nonnull__(pTHX_3) __attribute__nonnull__(pTHX_4); -STATIC I32 S_add_data(pTHX_ struct RExC_state_t* state, I32 n, const char *s) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_3); +STATIC I32 S_add_data(struct RExC_state_t* state, I32 n, const char *s) + __attribute__warn_unused_result__ + __attribute__nonnull__(1) + __attribute__nonnull__(3); STATIC void S_re_croak2(pTHX_ const char* pat1, const char* pat2, ...) __attribute__noreturn__ @@ -3591,19 +3596,19 @@ STATIC U8* S_reghop(pTHX_ U8 *pos, I32 off) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC U8* S_reghop3(pTHX_ U8 *pos, I32 off, U8 *lim) +STATIC U8* S_reghop3(U8 *pos, I32 off, U8 *lim) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_3); + __attribute__nonnull__(1) + __attribute__nonnull__(3); STATIC U8* S_reghopmaybe(pTHX_ U8 *pos, I32 off) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC U8* S_reghopmaybe3(pTHX_ U8 *pos, I32 off, U8 *lim) +STATIC U8* S_reghopmaybe3(U8 *pos, I32 off, U8 *lim) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_3); + __attribute__nonnull__(1) + __attribute__nonnull__(3); STATIC char* S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, const char *strend, I32 norun) __attribute__warn_unused_result__ @@ -3710,13 +3715,38 @@ STATIC char * S_F0convert(NV nv, char *endbuf, STRLEN *len) __attribute__nonnull__(2) __attribute__nonnull__(3); -#if defined(PERL_OLD_COPY_ON_WRITE) +# if defined(PERL_OLD_COPY_ON_WRITE) STATIC void S_sv_release_COW(pTHX_ SV *sv, const char *pvx, STRLEN len, SV *after) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_4); -#endif +# endif +STATIC SV * S_more_sv(pTHX); +STATIC void * S_more_bodies(pTHX_ size_t size, svtype sv_type); +STATIC bool S_sv_2iuv_common(pTHX_ SV *sv) + __attribute__nonnull__(pTHX_1); + +STATIC void S_glob_assign_glob(pTHX_ SV *dstr, SV *sstr, const int dtype) + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_2); + +STATIC void S_glob_assign_ref(pTHX_ SV *dstr, SV *sstr) + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_2); + +STATIC PTR_TBL_ENT_t * S_ptr_table_find(PTR_TBL_t *tbl, const void *sv) + __attribute__warn_unused_result__ + __attribute__nonnull__(1) + __attribute__nonnull__(2); + +STATIC SV * S_find_hash_subscript(pTHX_ HV *hv, SV *val) + __attribute__nonnull__(pTHX_2); + +STATIC I32 S_find_array_subscript(pTHX_ AV *av, SV *val) + __attribute__nonnull__(pTHX_2); + +STATIC SV * S_find_uninit_var(pTHX_ OP *obase, SV *uninit_sv, bool match); #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) @@ -3866,7 +3896,7 @@ STATIC char* S_stdize_locale(pTHX_ char* locs) #endif #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) -STATIC COP* S_closest_cop(pTHX_ COP *cop, const OP *o) +STATIC const COP* S_closest_cop(pTHX_ const COP *cop, const OP *o) __attribute__nonnull__(pTHX_1); STATIC SV* S_mess_alloc(pTHX); @@ -3882,8 +3912,9 @@ STATIC NV S_mulexp10(NV value, I32 exponent); #endif #if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT) -STATIC STRLEN S_is_utf8_char_slow(pTHX_ const U8 *s, const STRLEN len) - __attribute__nonnull__(pTHX_1); +STATIC STRLEN S_is_utf8_char_slow(const U8 *s, const STRLEN len) + __attribute__warn_unused_result__ + __attribute__nonnull__(1); STATIC bool S_is_utf8_common(pTHX_ const U8 *const p, SV **swash, const char * const swashname) __attribute__warn_unused_result__