From f717afa71cc4ba2f45eb5e57b4e54a3a3cdf8bd9 Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Fri, 30 Sep 2011 12:10:51 -0700 Subject: [PATCH] Oust cv_ckproto_len MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It is no longer used in core (having been superseded by cv_ckproto_len_flags), is unused on CPAN, and is not part of the API. The cv_ckproto ‘public’ macro is modified to use the _flags version. I put ‘public’ in quotes because, even before this commit, cv_ckproto was using a non-exported function, and hence could never have worked on a strict linker (or whatever you call it). --- embed.fnc | 2 -- embed.h | 1 - op.c | 8 -------- op.h | 2 +- proto.h | 5 ----- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/embed.fnc b/embed.fnc index 86447df..362375e 100644 --- a/embed.fnc +++ b/embed.fnc @@ -270,8 +270,6 @@ p |SV * |core_prototype |NULLOK SV *sv|NN const char *name \ p |OP * |coresub_op |NN SV *coreargssv|const int code \ |const int opnum : Used in sv.c -p |void |cv_ckproto_len |NN const CV* cv|NULLOK const GV* gv\ - |NULLOK const char* p|const STRLEN len p |void |cv_ckproto_len_flags |NN const CV* cv|NULLOK const GV* gv\ |NULLOK const char* p|const STRLEN len \ |const U32 flags diff --git a/embed.h b/embed.h index 2e8d3ea..41c359c 100644 --- a/embed.h +++ b/embed.h @@ -1029,7 +1029,6 @@ #define core_prototype(a,b,c,d) Perl_core_prototype(aTHX_ a,b,c,d) #define coresub_op(a,b,c) Perl_coresub_op(aTHX_ a,b,c) #define create_eval_scope(a) Perl_create_eval_scope(aTHX_ a) -#define cv_ckproto_len(a,b,c,d) Perl_cv_ckproto_len(aTHX_ a,b,c,d) #define cv_ckproto_len_flags(a,b,c,d,e) Perl_cv_ckproto_len_flags(aTHX_ a,b,c,d,e) #define cvgv_set(a,b) Perl_cvgv_set(aTHX_ a,b) #define cvstash_set(a,b) Perl_cvstash_set(aTHX_ a,b) diff --git a/op.c b/op.c index b85e2de..c08edd0 100644 --- a/op.c +++ b/op.c @@ -6275,14 +6275,6 @@ Perl_cv_ckproto_len_flags(pTHX_ const CV *cv, const GV *gv, const char *p, } } -void -Perl_cv_ckproto_len(pTHX_ const CV *cv, const GV *gv, const char *p, - const STRLEN len) -{ - PERL_ARGS_ASSERT_CV_CKPROTO_LEN; - cv_ckproto_len_flags(cv, gv, p, len, 0); -} - static void const_sv_xsub(pTHX_ CV* cv); /* diff --git a/op.h b/op.h index 02b6652..d09ccf1 100644 --- a/op.h +++ b/op.h @@ -667,7 +667,7 @@ least an C. /* no longer used anywhere in core */ #ifndef PERL_CORE #define cv_ckproto(cv, gv, p) \ - cv_ckproto_len((cv), (gv), (p), (p) ? strlen(p) : 0) + cv_ckproto_len_flags((cv), (gv), (p), (p) ? strlen(p) : 0, 0) #endif #ifdef PERL_CORE diff --git a/proto.h b/proto.h index a586f38..ba793bf 100644 --- a/proto.h +++ b/proto.h @@ -633,11 +633,6 @@ PERL_CALLCONV const XOP * Perl_custom_op_xop(pTHX_ const OP *o) #define PERL_ARGS_ASSERT_CUSTOM_OP_XOP \ assert(o) -PERL_CALLCONV void Perl_cv_ckproto_len(pTHX_ const CV* cv, const GV* gv, const char* p, const STRLEN len) - __attribute__nonnull__(pTHX_1); -#define PERL_ARGS_ASSERT_CV_CKPROTO_LEN \ - assert(cv) - PERL_CALLCONV void Perl_cv_ckproto_len_flags(pTHX_ const CV* cv, const GV* gv, const char* p, const STRLEN len, const U32 flags) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_CV_CKPROTO_LEN_FLAGS \ -- 2.7.4