From 7b71d0d142d89de9446cbbc63f724a74637404d3 Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Fri, 18 May 2012 22:44:30 -0700 Subject: [PATCH] Consign magic_setamagic to oblivion MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Now that ‘A’ magic is gone, nothing is using this function. --- embed.fnc | 1 - embed.h | 1 - mg.c | 12 ------------ proto.h | 6 ------ 4 files changed, 20 deletions(-) diff --git a/embed.fnc b/embed.fnc index e9f971b..0d509f1 100644 --- a/embed.fnc +++ b/embed.fnc @@ -752,7 +752,6 @@ p |U32 |magic_regdata_cnt|NN SV* sv|NN MAGIC* mg p |int |magic_regdatum_get|NN SV* sv|NN MAGIC* mg pr |int |magic_regdatum_set|NN SV* sv|NN MAGIC* mg p |int |magic_set |NN SV* sv|NN MAGIC* mg -p |int |magic_setamagic|NN SV* sv|NN MAGIC* mg p |int |magic_setarylen|NN SV* sv|NN MAGIC* mg p |int |magic_freearylen_p|NN SV* sv|NN MAGIC* mg p |int |magic_setdbline|NN SV* sv|NN MAGIC* mg diff --git a/embed.h b/embed.h index 149d8f8..f5d5e5d 100644 --- a/embed.h +++ b/embed.h @@ -1129,7 +1129,6 @@ #define magic_scalarpack(a,b) Perl_magic_scalarpack(aTHX_ a,b) #define magic_set(a,b) Perl_magic_set(aTHX_ a,b) #define magic_set_all_env(a,b) Perl_magic_set_all_env(aTHX_ a,b) -#define magic_setamagic(a,b) Perl_magic_setamagic(aTHX_ a,b) #define magic_setarylen(a,b) Perl_magic_setarylen(aTHX_ a,b) #define magic_setdbline(a,b) Perl_magic_setdbline(aTHX_ a,b) #define magic_setdefelem(a,b) Perl_magic_setdefelem(aTHX_ a,b) diff --git a/mg.c b/mg.c index 9acd5d2..74e320e 100644 --- a/mg.c +++ b/mg.c @@ -1691,18 +1691,6 @@ Perl_magic_clearisa(pTHX_ SV *sv, MAGIC *mg) } int -Perl_magic_setamagic(pTHX_ SV *sv, MAGIC *mg) -{ - dVAR; - PERL_ARGS_ASSERT_MAGIC_SETAMAGIC; - PERL_UNUSED_ARG(sv); - PERL_UNUSED_ARG(mg); - PL_amagic_generation++; - - return 0; -} - -int Perl_magic_getnkeys(pTHX_ SV *sv, MAGIC *mg) { HV * const hv = MUTABLE_HV(LvTARG(sv)); diff --git a/proto.h b/proto.h index 5423fe4..a52054b 100644 --- a/proto.h +++ b/proto.h @@ -2215,12 +2215,6 @@ PERL_CALLCONV int Perl_magic_set_all_env(pTHX_ SV* sv, MAGIC* mg) #define PERL_ARGS_ASSERT_MAGIC_SET_ALL_ENV \ assert(sv); assert(mg) -PERL_CALLCONV int Perl_magic_setamagic(pTHX_ SV* sv, MAGIC* mg) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); -#define PERL_ARGS_ASSERT_MAGIC_SETAMAGIC \ - assert(sv); assert(mg) - PERL_CALLCONV int Perl_magic_setarylen(pTHX_ SV* sv, MAGIC* mg) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -- 2.7.4