Cleanup in Hash::Util::FieldHash

Message-Id: <B45A1CCD-ECCA-44EB-97A6-1DA9F5E4DE81@mailbox.tu-berlin.de>

p4raw-id: //depot/perl@28449

diff --git a/ext/Hash/Util/FieldHash/FieldHash.xs b/ext/Hash/Util/FieldHash/FieldHash.xs
index 14e60f1..8dadc74 100644 (file)
--- a/ext/Hash/Util/FieldHash/FieldHash.xs
+++ b/ext/Hash/Util/FieldHash/FieldHash.xs
@@ -85,7 +85,8 @@ AV* HUF_get_trigger_content(SV* trigger) {
 }
 
 /* Delete an object from all field hashes it may occur in.  Also delete
- * the object's entry from the object registry.
+ * the object's entry from the object registry.  This function goes in
+ * the uf_set field of the uvar magic of a trigger.
  */
 I32 HUF_destroy_obj(pTHX_ IV index, SV* trigger) {
     /* Do nothing if the weakref wasn't undef'd.  Also don't bother
@@ -181,7 +182,6 @@ I32 HUF_watch_key(pTHX_ IV action, SV* field) {
 int HUF_get_status(HV* hash) {
     int ans = 0;
     if (hash && (SvTYPE(hash) == SVt_PVHV)) {
-        dMY_CXT;
         MAGIC* mg;
         struct ufuncs* uf;
         ans = (mg = mg_find((SV*)hash, PERL_MAGIC_uvar)) &&
@@ -294,7 +294,7 @@ CODE:
 OUTPUT:
     RETVAL
 
-SV*
+void
 _active_fields(SV* obj)
 PPCODE:
     if (SvROK(obj)) {

diff --git a/ext/Hash/Util/FieldHash/Makefile.PL b/ext/Hash/Util/FieldHash/Makefile.PL
index 1803f24..4793ec9 100644 (file)
--- a/ext/Hash/Util/FieldHash/Makefile.PL
+++ b/ext/Hash/Util/FieldHash/Makefile.PL
@@ -7,7 +7,7 @@ WriteMakefile(
     VERSION_FROM      => 'lib/Hash/Util/FieldHash.pm', # finds $VERSION
     PREREQ_PM         => {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
-      (ABSTRACT_FROM  => 'lib/Hash/Util/FieldHash.pm', # retrieve abstract from module
+      (ABSTRACT_FROM  => 'lib/Hash/Util/FieldHash.pm',
        AUTHOR         => 'Anno Siegel <anno4000@zrz.tu-berlin.de>') : ()),
     LIBS              => [''], # e.g., '-lm'
     DEFINE            => '', # e.g., '-DHAVE_SOMETHING'

diff --git a/ext/Hash/Util/FieldHash/t/01_load.t b/ext/Hash/Util/FieldHash/t/01_load.t
index a881cea..222ef9a 100644 (file)
--- a/ext/Hash/Util/FieldHash/t/01_load.t
+++ b/ext/Hash/Util/FieldHash/t/01_load.t
@@ -14,10 +14,6 @@ use Test::More tests => 8;
 # see that Hash::Util::FieldHash and Hash::Util load and export what
 # they should
 
-# note to self: this test only works in the perl build environment,
-# not in my homely test environment (haven't got the right Hash::Util.pm
-# there).  mask it.
-
 BEGIN {
     use_ok( 'Hash::Util');
     ok( defined( &Hash::Util::lock_keys), "Hash::Util::lock_keys found");