From: Vincent Pit Date: Tue, 24 Mar 2015 15:24:57 +0000 (-0300) Subject: Replace STATIC by static X-Git-Tag: rt100068~10 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=commitdiff_plain;h=461d68367d0b993e2dcbb87f1bf5b850c73c1232 Replace STATIC by static --- diff --git a/indirect.xs b/indirect.xs index ec570d7..57a0ea7 100644 --- a/indirect.xs +++ b/indirect.xs @@ -139,7 +139,7 @@ # undef MY_CXT # define MY_CXT indirect_globaldata # undef START_MY_CXT -# define START_MY_CXT STATIC my_cxt_t MY_CXT; +# define START_MY_CXT static my_cxt_t MY_CXT; # undef MY_CXT_INIT # define MY_CXT_INIT NOOP # undef MY_CXT_CLONE @@ -162,7 +162,7 @@ typedef OP *(*indirect_ck_t)(pTHX_ OP *); #else -STATIC void indirect_ck_replace(pTHX_ OPCODE type, indirect_ck_t new_ck, indirect_ck_t *old_ck_p) { +static void indirect_ck_replace(pTHX_ OPCODE type, indirect_ck_t new_ck, indirect_ck_t *old_ck_p) { #define indirect_ck_replace(T, NC, OCP) indirect_ck_replace(aTHX_ (T), (NC), (OCP)) I_CHECK_MUTEX_LOCK; if (!*old_ck_p) { @@ -174,7 +174,7 @@ STATIC void indirect_ck_replace(pTHX_ OPCODE type, indirect_ck_t new_ck, indirec #endif -STATIC void indirect_ck_restore(pTHX_ OPCODE type, indirect_ck_t *old_ck_p) { +static void indirect_ck_restore(pTHX_ OPCODE type, indirect_ck_t *old_ck_p) { #define indirect_ck_restore(T, OCP) indirect_ck_restore(aTHX_ (T), (OCP)) I_CHECK_MUTEX_LOCK; if (*old_ck_p) { @@ -300,7 +300,7 @@ typedef struct { # define indirect_dup_inc(S, U) SvREFCNT_inc(sv_dup((S), &((U)->params))) #endif -STATIC void indirect_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) { +static void indirect_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) { indirect_ptable_clone_ud *ud = ud_; indirect_hint_t *h1 = ent->val; indirect_hint_t *h2; @@ -322,7 +322,7 @@ STATIC void indirect_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) { ptable_hints_store(ud->tbl, ent->key, h2); } -STATIC void indirect_thread_cleanup(pTHX_ void *ud) { +static void indirect_thread_cleanup(pTHX_ void *ud) { dMY_CXT; SvREFCNT_dec(MY_CXT.global_code); @@ -333,13 +333,13 @@ STATIC void indirect_thread_cleanup(pTHX_ void *ud) { MY_CXT.tbl = NULL; } -STATIC int indirect_endav_free(pTHX_ SV *sv, MAGIC *mg) { +static int indirect_endav_free(pTHX_ SV *sv, MAGIC *mg) { SAVEDESTRUCTOR_X(indirect_thread_cleanup, NULL); return 0; } -STATIC MGVTBL indirect_endav_vtbl = { +static MGVTBL indirect_endav_vtbl = { 0, 0, 0, @@ -359,7 +359,7 @@ STATIC MGVTBL indirect_endav_vtbl = { #endif /* I_THREADSAFE */ #if I_WORKAROUND_REQUIRE_PROPAGATION -STATIC IV indirect_require_tag(pTHX) { +static IV indirect_require_tag(pTHX) { #define indirect_require_tag() indirect_require_tag(aTHX) const CV *cv, *outside; @@ -404,7 +404,7 @@ get_enclosing_cv: } #endif /* I_WORKAROUND_REQUIRE_PROPAGATION */ -STATIC SV *indirect_tag(pTHX_ SV *value) { +static SV *indirect_tag(pTHX_ SV *value) { #define indirect_tag(V) indirect_tag(aTHX_ (V)) indirect_hint_t *h; SV *code = NULL; @@ -443,7 +443,7 @@ STATIC SV *indirect_tag(pTHX_ SV *value) { return newSViv(PTR2IV(h)); } -STATIC SV *indirect_detag(pTHX_ const SV *hint) { +static SV *indirect_detag(pTHX_ const SV *hint) { #define indirect_detag(H) indirect_detag(aTHX_ (H)) indirect_hint_t *h; #if I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION @@ -468,9 +468,9 @@ STATIC SV *indirect_detag(pTHX_ const SV *hint) { return I_HINT_CODE(h); } -STATIC U32 indirect_hash = 0; +static U32 indirect_hash = 0; -STATIC SV *indirect_hint(pTHX) { +static SV *indirect_hint(pTHX) { #define indirect_hint() indirect_hint(aTHX) SV *hint = NULL; @@ -509,7 +509,7 @@ STATIC SV *indirect_hint(pTHX) { /* ... op -> source position ............................................... */ -STATIC void indirect_map_store(pTHX_ const OP *o, STRLEN pos, SV *sv, line_t line) { +static void indirect_map_store(pTHX_ const OP *o, STRLEN pos, SV *sv, line_t line) { #define indirect_map_store(O, P, N, L) indirect_map_store(aTHX_ (O), (P), (N), (L)) indirect_op_info_t *oi; const char *s; @@ -545,7 +545,7 @@ STATIC void indirect_map_store(pTHX_ const OP *o, STRLEN pos, SV *sv, line_t lin oi->line = line; } -STATIC const indirect_op_info_t *indirect_map_fetch(pTHX_ const OP *o) { +static const indirect_op_info_t *indirect_map_fetch(pTHX_ const OP *o) { #define indirect_map_fetch(O) indirect_map_fetch(aTHX_ (O)) dMY_CXT; @@ -555,7 +555,7 @@ STATIC const indirect_op_info_t *indirect_map_fetch(pTHX_ const OP *o) { return ptable_fetch(MY_CXT.map, o); } -STATIC void indirect_map_delete(pTHX_ const OP *o) { +static void indirect_map_delete(pTHX_ const OP *o) { #define indirect_map_delete(O) indirect_map_delete(aTHX_ (O)) dMY_CXT; @@ -565,7 +565,7 @@ STATIC void indirect_map_delete(pTHX_ const OP *o) { /* --- Check functions ----------------------------------------------------- */ -STATIC int indirect_find(pTHX_ SV *name_sv, const char *line_bufptr, STRLEN *name_pos) { +static int indirect_find(pTHX_ SV *name_sv, const char *line_bufptr, STRLEN *name_pos) { #define indirect_find(NSV, LBP, NP) indirect_find(aTHX_ (NSV), (LBP), (NP)) STRLEN name_len, line_len; const char *name, *name_end; @@ -606,9 +606,9 @@ STATIC int indirect_find(pTHX_ SV *name_sv, const char *line_bufptr, STRLEN *nam /* ... ck_const ............................................................ */ -STATIC OP *(*indirect_old_ck_const)(pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_const)(pTHX_ OP *) = 0; -STATIC OP *indirect_ck_const(pTHX_ OP *o) { +static OP *indirect_ck_const(pTHX_ OP *o) { o = indirect_old_ck_const(aTHX_ o); if (indirect_hint()) { @@ -650,9 +650,9 @@ STATIC OP *indirect_ck_const(pTHX_ OP *o) { /* ... ck_rv2sv ............................................................ */ -STATIC OP *(*indirect_old_ck_rv2sv)(pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_rv2sv)(pTHX_ OP *) = 0; -STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) { +static OP *indirect_ck_rv2sv(pTHX_ OP *o) { if (indirect_hint()) { OP *op = cUNOPo->op_first; SV *sv; @@ -717,9 +717,9 @@ done: /* ... ck_padany ........................................................... */ -STATIC OP *(*indirect_old_ck_padany)(pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_padany)(pTHX_ OP *) = 0; -STATIC OP *indirect_ck_padany(pTHX_ OP *o) { +static OP *indirect_ck_padany(pTHX_ OP *o) { o = indirect_old_ck_padany(aTHX_ o); if (indirect_hint()) { @@ -744,10 +744,10 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) { /* ... ck_scope ............................................................ */ -STATIC OP *(*indirect_old_ck_scope) (pTHX_ OP *) = 0; -STATIC OP *(*indirect_old_ck_lineseq)(pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_scope) (pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_lineseq)(pTHX_ OP *) = 0; -STATIC OP *indirect_ck_scope(pTHX_ OP *o) { +static OP *indirect_ck_scope(pTHX_ OP *o) { OP *(*old_ck)(pTHX_ OP *) = 0; switch (o->op_type) { @@ -771,9 +771,9 @@ STATIC OP *indirect_ck_scope(pTHX_ OP *o) { /* ... ck_method ........................................................... */ -STATIC OP *(*indirect_old_ck_method)(pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_method)(pTHX_ OP *) = 0; -STATIC OP *indirect_ck_method(pTHX_ OP *o) { +static OP *indirect_ck_method(pTHX_ OP *o) { if (indirect_hint()) { OP *op = cUNOPo->op_first; @@ -814,9 +814,9 @@ done: /* "use foo/no foo" compiles its call to import/unimport directly to a * method_named op. */ -STATIC OP *(*indirect_old_ck_method_named)(pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_method_named)(pTHX_ OP *) = 0; -STATIC OP *indirect_ck_method_named(pTHX_ OP *o) { +static OP *indirect_ck_method_named(pTHX_ OP *o) { if (indirect_hint()) { STRLEN pos; line_t line; @@ -846,9 +846,9 @@ done: /* ... ck_entersub ......................................................... */ -STATIC OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0; +static OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0; -STATIC OP *indirect_ck_entersub(pTHX_ OP *o) { +static OP *indirect_ck_entersub(pTHX_ OP *o) { SV *code = indirect_hint(); o = indirect_old_ck_entersub(aTHX_ o); @@ -933,9 +933,9 @@ done: return o; } -STATIC U32 indirect_initialized = 0; +static U32 indirect_initialized = 0; -STATIC void indirect_teardown(pTHX_ void *root) { +static void indirect_teardown(pTHX_ void *root) { if (!indirect_initialized) return; @@ -967,7 +967,7 @@ STATIC void indirect_teardown(pTHX_ void *root) { indirect_initialized = 0; } -STATIC void indirect_setup(pTHX) { +static void indirect_setup(pTHX) { #define indirect_setup() indirect_setup(aTHX) if (indirect_initialized) return; @@ -1004,7 +1004,7 @@ STATIC void indirect_setup(pTHX) { indirect_initialized = 1; } -STATIC U32 indirect_booted = 0; +static U32 indirect_booted = 0; /* --- XS ------------------------------------------------------------------ */