Two less auto variables

[perl/modules/Scope-Upper.git] / Upper.xs

diff --git a/Upper.xs b/Upper.xs
index e54e42cda5767985ed2bd9a2942dd3dd87bdf326..b2344b9804c0be57573c894ad2080a60e9981cb3 100644 (file)
--- a/Upper.xs
+++ b/Upper.xs
@@ -71,18 +71,6 @@
 
 /* ... Saving array elements ............................................... */
 
-STATIC I32 su_av_preeminent(pTHX_ AV *av, I32 key) {
-#define su_av_preeminent(A, K) su_av_preeminent(aTHX_ (A), (K))
- MAGIC *mg;
- HV *stash;
-
- if (!av) return 0;
- if (SvCANEXISTDELETE(av))
-  return av_exists(av, key);
-
- return 1;
-}
-
 #ifndef SAVEADELETE
 
 typedef struct {
@@ -117,12 +105,15 @@ STATIC void su_save_adelete(pTHX_ AV *av, I32 key) {
 
 STATIC void su_save_aelem(pTHX_ AV *av, SV *key, SV *val) {
 #define su_save_aelem(A, K, V) su_save_aelem(aTHX_ (A), (K), (V))
- I32 idx;
- I32 preeminent;
+ I32 idx = SvIV(key);
+ I32 preeminent = 1;
  SV **svp;
+ HV *stash;
+ MAGIC *mg;
+
+ if (SvCANEXISTDELETE(av))
+  preeminent = av_exists(av, idx);
 
- idx = SvIV(key);
- preeminent = su_av_preeminent(av, idx);
  svp = av_fetch(av, idx, 1);
  if (!*svp || *svp == &PL_sv_undef) croak(PL_no_aelem, idx);
 
@@ -140,25 +131,17 @@ STATIC void su_save_aelem(pTHX_ AV *av, SV *key, SV *val) {
 
 /* ... Saving hash elements ................................................ */
 
-STATIC I32 su_hv_preeminent(pTHX_ HV *hv, SV *keysv) {
-#define su_hv_preeminent(H, K) su_hv_preeminent(aTHX_ (H), (K))
- MAGIC *mg;
- HV *stash;
-
- if (!hv) return 0;
- if (SvCANEXISTDELETE(hv) || mg_find((SV *) hv, PERL_MAGIC_env))
-  return hv_exists_ent(hv, keysv, 0);
-
- return 1;
-}
-
 STATIC void su_save_helem(pTHX_ HV *hv, SV *keysv, SV *val) {
 #define su_save_helem(H, K, V) su_save_helem(aTHX_ (H), (K), (V))
- I32 preeminent;
+ I32 preeminent = 1;
  HE *he;
  SV **svp;
+ HV *stash;
+ MAGIC *mg;
+
+ if (SvCANEXISTDELETE(hv) || mg_find((SV *) hv, PERL_MAGIC_env))
+  preeminent = hv_exists_ent(hv, keysv, 0);
 
- preeminent = su_hv_preeminent(hv, keysv);
  he  = hv_fetch_ent(hv, keysv, 1, 0);
  svp = he ? &HeVAL(he) : NULL;
  if (!svp || *svp == &PL_sv_undef) croak("Modification of non-creatable hash value attempted, subscript \"%s\"", SvPV_nolen_const(*svp));
@@ -332,16 +315,14 @@ STATIC void su_localize(pTHX_ void *ud_) {
  switch (t) {
   case SVt_PVAV:
    if (elem) {
-    AV *av = GvAV(gv);
-    su_save_aelem(av, elem, val);
+    su_save_aelem(GvAV(gv), elem, val);
     goto done;
    } else
     save_ary(gv);
    break;
   case SVt_PVHV:
    if (elem) {
-    HV *hv = GvHV(gv);
-    su_save_helem(hv, elem, val);
+    su_save_helem(GvHV(gv), elem, val);
     goto done;
    } else
     save_hash(gv);