#include "perl.h"
#include "XSUB.h"
+#define NEED_sv_2pv_flags
#define NEED_sv_2pv_nolen
#include "ppport.h"
PREINIT:
HV *stash = NULL;
SV *type_filter = NULL;
+ register HE *he;
PPCODE:
switch ( GIMME_V ) {
PUTBACK;
- if ( SvROK(self) ) {
- SV **val = hv_fetchs((HV *)SvRV(self), "package", 0);
- if ( val ) {
- stash = gv_stashsv(*val, 0);
- }
- }
+ if (SvROK(self) && (he = hv_fetch_ent((HV *)SvRV(self), key_package, 0, hash_package)))
+ stash = gv_stashsv(HeVAL(he),0);
if ( stash ) {
- register HE *entry;
(void)hv_iterinit(stash);
if ( type_filter && SvPOK(type_filter) ) {
const char *const type = SvPV_nolen(type_filter);
-
- while ((entry = hv_iternext(stash))) {
- SV *const gv = hv_iterval(stash, entry);
- SV *const key = hv_iterkeysv(entry);
+ while ((he = hv_iternext(stash))) {
+ SV *const gv = HeVAL(he);
SV *sv;
- char *package = HvNAME(stash);
- STRLEN pkglen = strlen(package);
- char *fq;
- STRLEN fqlen;
-
- SPAGAIN;
+ char *key;
+ STRLEN keylen;
+ char *package;
+ SV *fq;
switch( SvTYPE(gv) ) {
case SVt_PVGV:
break;
case SVt_RV:
/* BAH! constants are horrible */
- fqlen = pkglen + SvCUR(key) + 3;
- fq = (char *)alloca(fqlen);
- snprintf(fq, fqlen, "%s::%s", package, SvPV_nolen(key));
- sv = (SV*)get_cv(fq, 0);
+
+ /* we don't really care about the length,
+ but that's the API */
+ key = HePV(he, keylen);
+ package = HvNAME(stash);
+ fq = newSVpvf("%s::%s", package, key);
+ sv = sv_2mortal((SV*)get_cv(SvPV_nolen(fq), 0));
break;
default:
continue;
}
if ( sv ) {
+ SV *key = hv_iterkeysv(he);
SPAGAIN;
EXTEND(SP, 2);
PUSHs(key);
- PUSHs(newRV_noinc(sv));
+ PUSHs(sv_2mortal(newRV_inc(sv)));
PUTBACK;
}
}
} else {
EXTEND(SP, HvKEYS(stash) * 2);
- while ((entry = hv_iternext(stash))) {
- SV *key = hv_iterkeysv(entry);
- SV *sv = hv_iterval(stash, entry);
+ while ((he = hv_iternext(stash))) {
+ SV *key = hv_iterkeysv(he);
+ SV *sv = HeVAL(he);
SPAGAIN;
PUSHs(key);
PUSHs(sv);