Change 28573 by [EMAIL PROTECTED] on 2006/07/14 14:42:57
Silence a compiler warning on Win32/VC++
Subject: Re: Smoke [5.9.4] 28569 FAIL(F) MSWin32 WinXP/.Net SP2 (x86/2
cpu)
From: Anno Siegel <[EMAIL PROTECTED]>
Date: Fri, 14 Jul 2006 16:33:01 +0200
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/ext/Hash/Util/FieldHash/FieldHash.xs#9 edit
Differences ...
==== //depot/perl/ext/Hash/Util/FieldHash/FieldHash.xs#9 (text) ====
Index: perl/ext/Hash/Util/FieldHash/FieldHash.xs
--- perl/ext/Hash/Util/FieldHash/FieldHash.xs#8~28556~ 2006-07-12
03:28:39.000000000 -0700
+++ perl/ext/Hash/Util/FieldHash/FieldHash.xs 2006-07-14 07:42:57.000000000
-0700
@@ -29,16 +29,15 @@
items = call_pv(HUF_OB_REG, G_SCALAR|G_NOARGS);
SPAGAIN;
- if (items == 1 && TOPs && SvROK(TOPs) && SvTYPE(SvRV(TOPs)) == SVt_PVHV) {
+ if (items == 1 && TOPs && SvROK(TOPs) && SvTYPE(SvRV(TOPs)) == SVt_PVHV)
ob_reg = (HV*)SvRV(POPs);
- }
PUTBACK;
FREETMPS;
LEAVE;
- if (ob_reg)
- return ob_reg;
- Perl_die(aTHX_ "Can't get object registry hash");
+ if (!ob_reg)
+ Perl_die(aTHX_ "Can't get object registry hash");
+ return ob_reg;
}
/* Deal with global context */
@@ -192,16 +191,18 @@
I32 HUF_watch_key(pTHX_ IV action, SV* field) {
MAGIC* mg = mg_find(field, PERL_MAGIC_uvar);
SV* keysv;
- if (!mg)
- Perl_die(aTHX_ "Rogue call of 'HUF_watch_key'");
- keysv = mg->mg_obj;
- if (keysv && SvROK(keysv)) {
- SV* ob_id = HUF_obj_id(keysv);
- mg->mg_obj = ob_id; /* key replacement */
- if (HUF_WOULD_CREATE_KEY(action)) {
- SV* trigger = HUF_get_trigger(keysv, ob_id);
- HUF_mark_field(trigger, field);
+ if (mg) {
+ keysv = mg->mg_obj;
+ if (keysv && SvROK(keysv)) {
+ SV* ob_id = HUF_obj_id(keysv);
+ mg->mg_obj = ob_id; /* key replacement */
+ if (HUF_WOULD_CREATE_KEY(action)) {
+ SV* trigger = HUF_get_trigger(keysv, ob_id);
+ HUF_mark_field(trigger, field);
+ }
}
+ } else {
+ Perl_die(aTHX_ "Rogue call of 'HUF_watch_key'");
}
return 0;
}
End of Patch.
