diff options
| author | Father Chrysostomos <sprout@cpan.org> | 2011-09-24 10:17:58 -0700 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2011-10-06 13:00:58 -0700 |
| commit | b2c03ebdf370f093a95cbbc154411f05c13e5913 (patch) | |
| tree | b86cf994c78042241766f40dd42446c8a94b96ee | |
| parent | 6c53d59b03d375fb8b965556b3c8cbd864ecf753 (diff) | |
| download | perl-b2c03ebdf370f093a95cbbc154411f05c13e5913.tar.gz | |
Remove some _get variants of *NAMEUTF8 macros in [gh]v.h
For macros that returns flags, the _get convention implies that there
could be a _set variant some day. But we don’t do that for flags.
| -rw-r--r-- | gv.h | 5 | ||||
| -rw-r--r-- | hv.h | 6 |
2 files changed, 4 insertions, 7 deletions
@@ -56,7 +56,7 @@ struct gp { })) # define GvNAME_get(gv) ({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); }) # define GvNAMELEN_get(gv) ({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); }) -# define GvNAMEUTF8_get(gv) ({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); }) +# define GvNAMEUTF8(gv) ({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); }) #else # define GvGP(gv) (0+(gv)->sv_u.svu_gp) # define GvGP_set(gv,gp) ((gv)->sv_u.svu_gp = (gp)) @@ -65,12 +65,11 @@ struct gp { # define GvNAME_HEK(gv) (GvXPVGV(gv)->xiv_u.xivu_namehek) # define GvNAME_get(gv) HEK_KEY(GvNAME_HEK(gv)) # define GvNAMELEN_get(gv) HEK_LEN(GvNAME_HEK(gv)) -# define GvNAMEUTF8_get(gv) HEK_UTF8(GvNAME_HEK(gv)) +# define GvNAMEUTF8(gv) HEK_UTF8(GvNAME_HEK(gv)) #endif #define GvNAME(gv) GvNAME_get(gv) #define GvNAMELEN(gv) GvNAMELEN_get(gv) -#define GvNAMEUTF8(gv) GvNAMEUTF8_get(gv) #define GvASSIGN_GENERATION(gv) (0 + ((XPV*) SvANY(gv))->xpv_len) #define GvASSIGN_GENERATION_set(gv,val) \ @@ -259,10 +259,8 @@ C<SV*>. #define HvEITER_get(hv) (SvOOK(hv) ? HvAUX(hv)->xhv_eiter : NULL) #define HvNAME(hv) HvNAME_get(hv) #define HvNAMELEN(hv) HvNAMELEN_get(hv) -#define HvNAMEUTF8(hv) HvNAMEUTF8_get(hv) #define HvENAME(hv) HvENAME_get(hv) #define HvENAMELEN(hv) HvENAMELEN_get(hv) -#define HvENAMEUTF8(hv) HvENAMEUTF8_get(hv) /* Checking that hv is a valid package stash is the caller's responsibility */ @@ -287,7 +285,7 @@ C<SV*>. #define HvNAMELEN_get(hv) \ ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvNAME_HEK_NN(hv)) \ ? HEK_LEN(HvNAME_HEK_NN(hv)) : 0) -#define HvNAMEUTF8_get(hv) \ +#define HvNAMEUTF8(hv) \ ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvNAME_HEK_NN(hv)) \ ? HEK_UTF8(HvNAME_HEK_NN(hv)) : 0) #define HvENAME_HEK_NN(hv) \ @@ -305,7 +303,7 @@ C<SV*>. #define HvENAMELEN_get(hv) \ ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvENAME_HEK_NN(hv)) \ ? HEK_LEN(HvENAME_HEK_NN(hv)) : 0) -#define HvENAMEUTF8_get(hv) \ +#define HvENAMEUTF8(hv) \ ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvENAME_HEK_NN(hv)) \ ? HEK_UTF8(HvENAME_HEK_NN(hv)) : 0) |