A macro used only once isn't a typing saving, and 3 macro definitions

never used are more obfuscation than clarification, so inline the only
use of SAVECOPLABEL_FREE(), and remove the unthreaded variant and
both SAVECOPLABEL()s. Exterminate! Exterminate! Exterminate!

p4raw-id: //depot/perl@33654

diff --git a/cop.h b/cop.h
index 272dbcc..90f96a1 100644 (file)
--- a/cop.h
+++ b/cop.h
@@ -196,7 +196,7 @@ struct cop {
 #  ifdef NETWARE
 #    define CopSTASH_free(c) SAVECOPSTASH_FREE(c)
 #    define CopFILE_free(c) SAVECOPFILE_FREE(c)
-#    define CopLABEL_free(c) SAVECOPLABEL_FREE(c)
+#    define CopLABEL_free(c) SAVESHAREDPV(CopLABEL(c))
 #    define CopLABEL_alloc(pv) ((pv)?savepv(pv):NULL)
 #  else
 #    define CopSTASH_free(c)   PerlMemShared_free(CopSTASHPV(c))

diff --git a/scope.h b/scope.h
index 7f56460..bb033e3 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -227,15 +227,11 @@ Closing bracket on a callback.  See C<ENTER> and L<perlcall>.
 #  define SAVECOPSTASH_FREE(c) SAVESHAREDPV(CopSTASHPV(c))
 #  define SAVECOPFILE(c)       SAVEPPTR(CopFILE(c))
 #  define SAVECOPFILE_FREE(c)  SAVESHAREDPV(CopFILE(c))
-#  define SAVECOPLABEL(c)      SAVEPPTR(CopLABEL(c))
-#  define SAVECOPLABEL_FREE(c) SAVESHAREDPV(CopLABEL(c))
 #else
 #  define SAVECOPSTASH(c)      SAVESPTR(CopSTASH(c))
 #  define SAVECOPSTASH_FREE(c) SAVECOPSTASH(c) /* XXX not refcounted */
 #  define SAVECOPFILE(c)       SAVESPTR(CopFILEGV(c))
 #  define SAVECOPFILE_FREE(c)  SAVEGENERICSV(CopFILEGV(c))
-#  define SAVECOPLABEL(c)      SAVEPPTR(CopLABEL(c))
-#  define SAVECOPLABEL_FREE(c) SAVEPPTR(CopLABEL(c))
 #endif
 
 #define SAVECOPLINE(c)         SAVEI32(CopLINE(c))