Change 34412 by [EMAIL PROTECTED] on 2008/09/23 20:16:51
Integrate:
[ 34411]
Integrate:
[ 34351]
The stash argument to S_isa_lookup() actually never is NULL.
[ 34352]
As stash can't be NULL, no need to check name_stash is not NULL before
comparing the two, as a NULL == NULL comparison can't happen.
Affected files ...
... //depot/maint-5.8/perl/embed.fnc#248 integrate
... //depot/maint-5.8/perl/proto.h#239 integrate
... //depot/maint-5.8/perl/universal.c#71 integrate
Differences ...
==== //depot/maint-5.8/perl/embed.fnc#248 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#247~33866~ 2008-05-19 07:57:58.000000000 -0700
+++ perl/embed.fnc 2008-09-23 13:16:51.000000000 -0700
@@ -1444,7 +1444,7 @@
#endif
#if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
-s |bool|isa_lookup |NULLOK HV *stash|NN const char *name|NULLOK
const HV * const name_stash|int len|int level
+s |bool|isa_lookup |NN HV *stash|NN const char *name|NULLOK const
HV * const name_stash|int len|int level
#endif
#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
==== //depot/maint-5.8/perl/universal.c#71 (text) ====
Index: perl/universal.c
--- perl/universal.c#70~33217~ 2008-02-02 14:47:50.000000000 -0800
+++ perl/universal.c 2008-09-23 13:16:51.000000000 -0700
@@ -44,7 +44,7 @@
/* A stash/class can go by many names (ie. User == main::User), so
we compare the stash itself just in case */
- if (name_stash && ((const HV *)stash == name_stash))
+ if ((const HV *)stash == name_stash)
return TRUE;
hvname = HvNAME_get(stash);
End of Patch.
