In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/741002cc5c243352a3db99665e989daddc83b996?hp=4016df9387d66fd973bd1a0d6fd8800f448e5485>
- Log ----------------------------------------------------------------- commit 741002cc5c243352a3db99665e989daddc83b996 Author: Karl Williamson <[email protected]> Date: Fri Nov 18 13:34:03 2016 -0700 Storable: Rmv impediment to compiling under C++11 C++11 changed from earlier versions to require space between the end of a string literal and a macro, so that a feature can unambiguously be added to the language. Starting in g++ 6.2, the compiler emits a deprecation warning when there isn't a space (presumably so that future versions can support C++11). Although not required by the C++11 change, this patch also makes sure there is space after a macro call, before a string literal. This makes the macro stand out, and is easier to read. This patch also changes the affected lines to not exceed 79 columns, as specified by perlhack. Code and modules included with the Perl core need to be compilable using C++. This is so that perl can be embedded in C++ programs. (Actually, only the hdr files need to be so compilable, but it would be hard to test that just the hdrs are compilable.) So we need to accommodate changes to the C++ language. ----------------------------------------------------------------------- Summary of changes: dist/Storable/Storable.pm | 2 +- dist/Storable/Storable.xs | 188 +++++++++++++++++++++++++--------------------- 2 files changed, 103 insertions(+), 87 deletions(-) diff --git a/dist/Storable/Storable.pm b/dist/Storable/Storable.pm index 616869f..7101641 100644 --- a/dist/Storable/Storable.pm +++ b/dist/Storable/Storable.pm @@ -22,7 +22,7 @@ package Storable; @ISA = qw(Exporter); use vars qw($canonical $forgive_me $VERSION); -$VERSION = '2.58'; +$VERSION = '2.59'; BEGIN { if (eval { diff --git a/dist/Storable/Storable.xs b/dist/Storable/Storable.xs index 053951c..3788f57 100644 --- a/dist/Storable/Storable.xs +++ b/dist/Storable/Storable.xs @@ -1046,7 +1046,7 @@ static const char byteorderstr_56[] = {BYTEORDER_BYTES_56, 0}; STMT_START { \ if (av_store(cxt->aseen, cxt->tagnum++, i ? (SV*)(y) : SvREFCNT_inc(y)) == 0) \ return (SV *) 0; \ - TRACEME(("aseen(#%d) = 0x%"UVxf" (refcnt=%d)", cxt->tagnum-1, \ + TRACEME(("aseen(#%d) = 0x%" UVxf " (refcnt=%d)", cxt->tagnum-1, \ PTR2UV(y), SvREFCNT(y)-1)); \ } STMT_END @@ -1079,7 +1079,7 @@ static const char byteorderstr_56[] = {BYTEORDER_BYTES_56, 0}; #define BLESS(s,stash) \ STMT_START { \ SV *ref; \ - TRACEME(("blessing 0x%"UVxf" in %s", PTR2UV(s), (HvNAME_get(stash)))); \ + TRACEME(("blessing 0x%" UVxf " in %s", PTR2UV(s), (HvNAME_get(stash))));\ ref = newRV_noinc(s); \ if (cxt->in_retrieve_overloaded && Gv_AMG(stash)) \ { \ @@ -1753,7 +1753,7 @@ static SV *pkg_fetchmeth( gv = gv_fetchmethod_autoload(pkg, method, FALSE); if (gv && isGV(gv)) { sv = newRV((SV*) GvCV(gv)); - TRACEME(("%s->%s: 0x%"UVxf, hvname, method, PTR2UV(sv))); + TRACEME(("%s->%s: 0x%" UVxf, hvname, method, PTR2UV(sv))); } else { sv = newSVsv(&PL_sv_undef); TRACEME(("%s->%s: not found", hvname, method)); @@ -1837,7 +1837,7 @@ static SV *pkg_can( TRACEME(("cached %s->%s: not found", hvname, method)); return (SV *) 0; } else { - TRACEME(("cached %s->%s: 0x%"UVxf, + TRACEME(("cached %s->%s: 0x%" UVxf, hvname, method, PTR2UV(sv))); return sv; } @@ -1879,7 +1879,7 @@ static SV *scalar_call( int i; XPUSHs(ary[0]); /* Frozen string */ for (i = 1; i < cnt; i++) { - TRACEME(("pushing arg #%d (0x%"UVxf")...", + TRACEME(("pushing arg #%d (0x%" UVxf ")...", i, PTR2UV(ary[i]))); XPUSHs(sv_2mortal(newRV(ary[i]))); } @@ -2004,7 +2004,7 @@ static int known_class( static int store_ref(pTHX_ stcxt_t *cxt, SV *sv) { int is_weak = 0; - TRACEME(("store_ref (0x%"UVxf")", PTR2UV(sv))); + TRACEME(("store_ref (0x%" UVxf ")", PTR2UV(sv))); /* * Follow reference, and check if target is overloaded. @@ -2013,14 +2013,16 @@ static int store_ref(pTHX_ stcxt_t *cxt, SV *sv) #ifdef SvWEAKREF if (SvWEAKREF(sv)) is_weak = 1; - TRACEME(("ref (0x%"UVxf") is%s weak", PTR2UV(sv), is_weak ? "" : "n't")); + TRACEME(("ref (0x%" UVxf ") is%s weak", PTR2UV(sv), is_weak + ? "" + : "n't")); #endif sv = SvRV(sv); if (SvOBJECT(sv)) { HV *stash = (HV *) SvSTASH(sv); if (stash && Gv_AMG(stash)) { - TRACEME(("ref (0x%"UVxf") is overloaded", PTR2UV(sv))); + TRACEME(("ref (0x%" UVxf ") is overloaded", PTR2UV(sv))); PUTMARK(is_weak ? SX_WEAKOVERLOAD : SX_OVERLOAD); } else PUTMARK(is_weak ? SX_WEAKREF : SX_REF); @@ -2053,7 +2055,7 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) STRLEN len; U32 flags = SvFLAGS(sv); /* "cc -O" may put it in register */ - TRACEME(("store_scalar (0x%"UVxf")", PTR2UV(sv))); + TRACEME(("store_scalar (0x%" UVxf ")", PTR2UV(sv))); /* * For efficiency, break the SV encapsulation by peaking at the flags @@ -2066,7 +2068,7 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) TRACEME(("immortal undef")); PUTMARK(SX_SV_UNDEF); } else { - TRACEME(("undef at 0x%"UVxf, PTR2UV(sv))); + TRACEME(("undef at 0x%" UVxf, PTR2UV(sv))); PUTMARK(SX_UNDEF); } return 0; @@ -2141,7 +2143,8 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) * case. */ if ((flags & SVf_IVisUV) && SvUV(sv) > IV_MAX) { - TRACEME(("large unsigned integer as string, value = %"UVuf, SvUV(sv))); + TRACEME(("large unsigned integer as string, value = %" UVuf, + SvUV(sv))); goto string_readlen; } #endif @@ -2171,7 +2174,8 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) #endif (iv > (IV)0x7FFFFFFF) || (iv < -(IV)0x80000000)) { /* Bigger than 32 bits. */ - TRACEME(("large network order integer as string, value = %"IVdf, iv)); + TRACEME(("large network order integer as string, value = %" + IVdf, iv)); goto string_readlen; } #endif @@ -2186,7 +2190,8 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) WRITE(&iv, sizeof(iv)); } - TRACEME(("ok (integer 0x%"UVxf", value = %"IVdf")", PTR2UV(sv), iv)); + TRACEME(("ok (integer 0x%" UVxf ", value = %" IVdf ")", + PTR2UV(sv), iv)); } else if (flags & SVf_NOK) { NV nv; #if (PATCHLEVEL <= 6) @@ -2195,7 +2200,7 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) * Watch for number being an integer in disguise. */ if (nv == (NV) (iv = I_V(nv))) { - TRACEME(("double %"NVff" is actually integer %"IVdf, nv, iv)); + TRACEME(("double %" NVff " is actually integer %" IVdf, nv, iv)); goto integer; /* Share code above */ } #else @@ -2209,14 +2214,15 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) #endif if (cxt->netorder) { - TRACEME(("double %"NVff" stored as string", nv)); + TRACEME(("double %" NVff " stored as string", nv)); goto string_readlen; /* Share code below */ } PUTMARK(SX_DOUBLE); WRITE(&nv, sizeof(nv)); - TRACEME(("ok (double 0x%"UVxf", value = %"NVff")", PTR2UV(sv), nv)); + TRACEME(("ok (double 0x%" UVxf ", value = %" NVff ")", + PTR2UV(sv), nv)); } else if (flags & (SVp_POK | SVp_NOK | SVp_IOK)) { #ifdef SvVOK @@ -2248,10 +2254,10 @@ static int store_scalar(pTHX_ stcxt_t *cxt, SV *sv) STORE_UTF8STR(pv, wlen); else STORE_SCALAR(pv, wlen); - TRACEME(("ok (scalar 0x%"UVxf" '%s', length = %"IVdf")", + TRACEME(("ok (scalar 0x%" UVxf " '%s', length = %" IVdf ")", PTR2UV(sv), SvPVX(sv), (IV)len)); } else - CROAK(("Can't determine type of %s(0x%"UVxf")", + CROAK(("Can't determine type of %s(0x%" UVxf ")", sv_reftype(sv, FALSE), PTR2UV(sv))); return 0; /* Ok, no recursion on scalars */ @@ -2272,7 +2278,7 @@ static int store_array(pTHX_ stcxt_t *cxt, AV *av) I32 i; int ret; - TRACEME(("store_array (0x%"UVxf")", PTR2UV(av))); + TRACEME(("store_array (0x%" UVxf ")", PTR2UV(av))); /* * Signal array by emitting SX_ARRAY, followed by the array length. @@ -2375,10 +2381,10 @@ static int store_hash(pTHX_ stcxt_t *cxt, HV *hv) if (flagged_hash) { /* needs int cast for C++ compilers, doesn't it? */ - TRACEME(("store_hash (0x%"UVxf") (flags %x)", PTR2UV(hv), + TRACEME(("store_hash (0x%" UVxf ") (flags %x)", PTR2UV(hv), (int) hash_flags)); } else { - TRACEME(("store_hash (0x%"UVxf")", PTR2UV(hv))); + TRACEME(("store_hash (0x%" UVxf ")", PTR2UV(hv))); } /* @@ -2491,7 +2497,7 @@ static int store_hash(pTHX_ stcxt_t *cxt, HV *hv) * Store value first. */ - TRACEME(("(#%d) value 0x%"UVxf, i, PTR2UV(val))); + TRACEME(("(#%d) value 0x%" UVxf, i, PTR2UV(val))); if ((ret = store(aTHX_ cxt, val))) /* Extra () for -Wall, grr... */ goto out; @@ -2611,7 +2617,7 @@ static int store_hash(pTHX_ stcxt_t *cxt, HV *hv) * Store value first. */ - TRACEME(("(#%d) value 0x%"UVxf, i, PTR2UV(val))); + TRACEME(("(#%d) value 0x%" UVxf, i, PTR2UV(val))); if ((ret = store(aTHX_ cxt, val))) /* Extra () for -Wall, grr... */ goto out; @@ -2671,7 +2677,7 @@ static int store_hash(pTHX_ stcxt_t *cxt, HV *hv) } } - TRACEME(("ok (hash 0x%"UVxf")", PTR2UV(hv))); + TRACEME(("ok (hash 0x%" UVxf ")", PTR2UV(hv))); out: HvRITER_set(hv, riter); /* Restore hash iterator state */ @@ -2701,7 +2707,7 @@ static int store_code(pTHX_ stcxt_t *cxt, CV *cv) int count, reallen; SV *text, *bdeparse; - TRACEME(("store_code (0x%"UVxf")", PTR2UV(cv))); + TRACEME(("store_code (0x%" UVxf ")", PTR2UV(cv))); if ( cxt->deparse == 0 || @@ -2804,7 +2810,7 @@ static int store_tied(pTHX_ stcxt_t *cxt, SV *sv) int svt = SvTYPE(sv); char mtype = 'P'; - TRACEME(("store_tied (0x%"UVxf")", PTR2UV(sv))); + TRACEME(("store_tied (0x%" UVxf ")", PTR2UV(sv))); /* * We have a small run-time penalty here because we chose to factorise @@ -2872,7 +2878,7 @@ static int store_tied_item(pTHX_ stcxt_t *cxt, SV *sv) MAGIC *mg; int ret; - TRACEME(("store_tied_item (0x%"UVxf")", PTR2UV(sv))); + TRACEME(("store_tied_item (0x%" UVxf ")", PTR2UV(sv))); if (!(mg = mg_find(sv, 'p'))) CROAK(("No magic 'p' found while storing reference to tied item")); @@ -2884,12 +2890,14 @@ static int store_tied_item(pTHX_ stcxt_t *cxt, SV *sv) if (mg->mg_ptr) { TRACEME(("store_tied_item: storing a ref to a tied hash item")); PUTMARK(SX_TIED_KEY); - TRACEME(("store_tied_item: storing OBJ 0x%"UVxf, PTR2UV(mg->mg_obj))); + TRACEME(("store_tied_item: storing OBJ 0x%" UVxf, + PTR2UV(mg->mg_obj))); if ((ret = store(aTHX_ cxt, mg->mg_obj))) /* Extra () for -Wall, grr... */ return ret; - TRACEME(("store_tied_item: storing PTR 0x%"UVxf, PTR2UV(mg->mg_ptr))); + TRACEME(("store_tied_item: storing PTR 0x%" UVxf, + PTR2UV(mg->mg_ptr))); if ((ret = store(aTHX_ cxt, (SV *) mg->mg_ptr))) /* Idem, for -Wall */ return ret; @@ -2898,7 +2906,8 @@ static int store_tied_item(pTHX_ stcxt_t *cxt, SV *sv) TRACEME(("store_tied_item: storing a ref to a tied array item ")); PUTMARK(SX_TIED_IDX); - TRACEME(("store_tied_item: storing OBJ 0x%"UVxf, PTR2UV(mg->mg_obj))); + TRACEME(("store_tied_item: storing OBJ 0x%" UVxf, + PTR2UV(mg->mg_obj))); if ((ret = store(aTHX_ cxt, mg->mg_obj))) /* Idem, for -Wall */ return ret; @@ -3154,7 +3163,8 @@ static int store_hook( goto sv_seen; /* Avoid moving code too far to the right */ #endif - TRACEME(("listed object %d at 0x%"UVxf" is unknown", i-1, PTR2UV(xsv))); + TRACEME(("listed object %d at 0x%" UVxf " is unknown", + i-1, PTR2UV(xsv))); /* * We need to recurse to store that object and get it to be known @@ -3223,7 +3233,7 @@ static int store_hook( tag = *svh; #endif ary[i] = tag; - TRACEME(("listed object %d at 0x%"UVxf" is tag #%"UVuf, + TRACEME(("listed object %d at 0x%" UVxf " is tag #%" UVuf, i-1, PTR2UV(xsv), PTR2UV(tag))); } @@ -3270,7 +3280,7 @@ check_done: */ TRACEME(("SX_HOOK (recursed=%d) flags=0x%x " - "class=%"IVdf" len=%"IVdf" len2=%"IVdf" len3=%d", + "class=%" IVdf " len=%" IVdf " len2=%" IVdf " len3=%d", recursed, flags, (IV)classnum, (IV)len, (IV)len2, count-1)); /* SX_HOOK <flags> [<extra>] */ @@ -3357,8 +3367,8 @@ check_done: (svt == SVt_PVAV) ? "array" : "scalar")); } - TRACEME(("handling the magic object 0x%"UVxf" part of 0x%"UVxf, - PTR2UV(mg->mg_obj), PTR2UV(sv))); + TRACEME(("handling the magic object 0x%" UVxf " part of 0x%" + UVxf, PTR2UV(mg->mg_obj), PTR2UV(sv))); /* * [<magic object>] @@ -3425,7 +3435,7 @@ static int store_blessed( classname = HvNAME_get(pkg); len = strlen(classname); - TRACEME(("blessed 0x%"UVxf" in %s, no hook: tagged #%d", + TRACEME(("blessed 0x%" UVxf " in %s, no hook: tagged #%d", PTR2UV(sv), classname, cxt->tagnum)); /* @@ -3495,19 +3505,19 @@ static int store_other(pTHX_ stcxt_t *cxt, SV *sv) ) CROAK(("Can't store %s items", sv_reftype(sv, FALSE))); - warn("Can't store item %s(0x%"UVxf")", + warn("Can't store item %s(0x%" UVxf ")", sv_reftype(sv, FALSE), PTR2UV(sv)); /* * Store placeholder string as a scalar instead... */ - (void) sprintf(buf, "You lost %s(0x%"UVxf")%c", sv_reftype(sv, FALSE), + (void) sprintf(buf, "You lost %s(0x%" UVxf ")%c", sv_reftype(sv, FALSE), PTR2UV(sv), (char) 0); len = strlen(buf); STORE_SCALAR(buf, len); - TRACEME(("ok (dummy \"%s\", length = %"IVdf")", buf, (IV) len)); + TRACEME(("ok (dummy \"%s\", length = %" IVdf ")", buf, (IV) len)); return 0; } @@ -3610,7 +3620,7 @@ static int store(pTHX_ stcxt_t *cxt, SV *sv) HV *hseen = cxt->hseen; #endif - TRACEME(("store (0x%"UVxf")", PTR2UV(sv))); + TRACEME(("store (0x%" UVxf ")", PTR2UV(sv))); /* * If object has already been stored, do not duplicate data. @@ -3668,7 +3678,8 @@ static int store(pTHX_ stcxt_t *cxt, SV *sv) tagval = htonl(LOW_32BITS(*svh)); #endif - TRACEME(("object 0x%"UVxf" seen as #%d", PTR2UV(sv), ntohl(tagval))); + TRACEME(("object 0x%" UVxf " seen as #%d", + PTR2UV(sv), ntohl(tagval))); PUTMARK(SX_OBJECT); WRITE_I32(tagval); @@ -3703,7 +3714,7 @@ static int store(pTHX_ stcxt_t *cxt, SV *sv) type = sv_type(aTHX_ sv); undef_special_case: - TRACEME(("storing 0x%"UVxf" tag #%d, type %d...", + TRACEME(("storing 0x%" UVxf " tag #%d, type %d...", PTR2UV(sv), cxt->tagnum, type)); if (SvOBJECT(sv)) { @@ -3712,7 +3723,7 @@ undef_special_case: } else ret = SV_STORE(type)(aTHX_ cxt, sv); - TRACEME(("%s (stored 0x%"UVxf", refcnt=%d, %s)", + TRACEME(("%s (stored 0x%" UVxf ", refcnt=%d, %s)", ret ? "FAILED" : "ok", PTR2UV(sv), SvREFCNT(sv), sv_reftype(sv, FALSE))); @@ -4013,7 +4024,8 @@ static SV *retrieve_idx_blessed(pTHX_ stcxt_t *cxt, const char *cname) sva = av_fetch(cxt->aclass, idx, FALSE); if (!sva) - CROAK(("Class name #%"IVdf" should have been seen already", (IV) idx)); + CROAK(("Class name #%" IVdf " should have been seen already", + (IV) idx)); classname = SvPVX(*sva); /* We know it's a PV, by construction */ @@ -4200,7 +4212,7 @@ static SV *retrieve_hook(pTHX_ stcxt_t *cxt, const char *cname) if (!rv) return (SV *) 0; SvREFCNT_dec(rv); - TRACEME(("retrieve_hook back with rv=0x%"UVxf, + TRACEME(("retrieve_hook back with rv=0x%" UVxf, PTR2UV(rv))); GETMARK(flags); } @@ -4220,8 +4232,8 @@ static SV *retrieve_hook(pTHX_ stcxt_t *cxt, const char *cname) sva = av_fetch(cxt->aclass, idx, FALSE); if (!sva) - CROAK(("Class name #%"IVdf" should have been seen already", - (IV) idx)); + CROAK(("Class name #%" IVdf + " should have been seen already", (IV) idx)); classname = SvPVX(*sva); /* We know it's a PV, by construction */ TRACEME(("class ID %d => %s", idx, classname)); @@ -4332,8 +4344,9 @@ static SV *retrieve_hook(pTHX_ stcxt_t *cxt, const char *cname) xsv = &PL_sv_undef; svh = &xsv; } else { - CROAK(("Object #%"IVdf" should have been retrieved already", - (IV) tag)); + CROAK(("Object #%" IVdf + " should have been retrieved already", + (IV) tag)); } } xsv = *svh; @@ -4448,7 +4461,7 @@ static SV *retrieve_hook(pTHX_ stcxt_t *cxt, const char *cname) * the object itself being already created by the runtime. */ - TRACEME(("calling STORABLE_thaw on %s at 0x%"UVxf" (%"IVdf" args)", + TRACEME(("calling STORABLE_thaw on %s at 0x%" UVxf " (%" IVdf " args)", classname, PTR2UV(sv), (IV) AvFILLp(av) + 1)); rv = newRV(sv); @@ -4473,11 +4486,11 @@ static SV *retrieve_hook(pTHX_ stcxt_t *cxt, const char *cname) if (!extra_type) return sv; - TRACEME(("retrieving magic object for 0x%"UVxf"...", PTR2UV(sv))); + TRACEME(("retrieving magic object for 0x%" UVxf "...", PTR2UV(sv))); rv = retrieve(aTHX_ cxt, 0); /* Retrieve <magic object> */ - TRACEME(("restoring the magic object 0x%"UVxf" part of 0x%"UVxf, + TRACEME(("restoring the magic object 0x%" UVxf " part of 0x%" UVxf, PTR2UV(rv), PTR2UV(sv))); switch (extra_type) { @@ -4584,7 +4597,7 @@ static SV *retrieve_ref(pTHX_ stcxt_t *cxt, const char *cname) SvRV_set(rv, sv); /* $rv = \$sv */ SvROK_on(rv); - TRACEME(("ok (retrieve_ref at 0x%"UVxf")", PTR2UV(rv))); + TRACEME(("ok (retrieve_ref at 0x%" UVxf ")", PTR2UV(rv))); return rv; } @@ -4653,7 +4666,7 @@ static SV *retrieve_overloaded(pTHX_ stcxt_t *cxt, const char *cname) stash = SvTYPE(sv) ? (HV *) SvSTASH (sv) : 0; if (!stash) { - CROAK(("Cannot restore overloading on %s(0x%"UVxf + CROAK(("Cannot restore overloading on %s(0x%" UVxf ") (package <unknown>)", sv_reftype(sv, FALSE), PTR2UV(sv))); @@ -4664,7 +4677,7 @@ static SV *retrieve_overloaded(pTHX_ stcxt_t *cxt, const char *cname) TRACEME(("Going to load module '%s'", package)); load_module(PERL_LOADMOD_NOIMPORT, newSVpv(package, 0), Nullsv); if (!Gv_AMG(stash)) { - CROAK(("Cannot restore overloading on %s(0x%"UVxf + CROAK(("Cannot restore overloading on %s(0x%" UVxf ") (package %s) (even after a \"require %s;\")", sv_reftype(sv, FALSE), PTR2UV(sv), @@ -4674,7 +4687,7 @@ static SV *retrieve_overloaded(pTHX_ stcxt_t *cxt, const char *cname) SvAMAGIC_on(rv); - TRACEME(("ok (retrieve_overloaded at 0x%"UVxf")", PTR2UV(rv))); + TRACEME(("ok (retrieve_overloaded at 0x%" UVxf ")", PTR2UV(rv))); return rv; } @@ -4728,7 +4741,7 @@ static SV *retrieve_tied_array(pTHX_ stcxt_t *cxt, const char *cname) sv_magic(tv, sv, 'P', (char *)NULL, 0); SvREFCNT_dec(sv); /* Undo refcnt inc from sv_magic() */ - TRACEME(("ok (retrieve_tied_array at 0x%"UVxf")", PTR2UV(tv))); + TRACEME(("ok (retrieve_tied_array at 0x%" UVxf ")", PTR2UV(tv))); return tv; } @@ -4758,7 +4771,7 @@ static SV *retrieve_tied_hash(pTHX_ stcxt_t *cxt, const char *cname) sv_magic(tv, sv, 'P', (char *)NULL, 0); SvREFCNT_dec(sv); /* Undo refcnt inc from sv_magic() */ - TRACEME(("ok (retrieve_tied_hash at 0x%"UVxf")", PTR2UV(tv))); + TRACEME(("ok (retrieve_tied_hash at 0x%" UVxf ")", PTR2UV(tv))); return tv; } @@ -4796,7 +4809,7 @@ static SV *retrieve_tied_scalar(pTHX_ stcxt_t *cxt, const char *cname) SvREFCNT_dec(obj); } - TRACEME(("ok (retrieve_tied_scalar at 0x%"UVxf")", PTR2UV(tv))); + TRACEME(("ok (retrieve_tied_scalar at 0x%" UVxf ")", PTR2UV(tv))); return tv; } @@ -4883,7 +4896,7 @@ static SV *retrieve_lscalar(pTHX_ stcxt_t *cxt, const char *cname) HV *stash; RLEN(len); - TRACEME(("retrieve_lscalar (#%d), len = %"IVdf, cxt->tagnum, (IV) len)); + TRACEME(("retrieve_lscalar (#%d), len = %" IVdf, cxt->tagnum, (IV) len)); /* * Allocate an empty scalar of the suitable length. @@ -4914,8 +4927,8 @@ static SV *retrieve_lscalar(pTHX_ stcxt_t *cxt, const char *cname) if (cxt->s_tainted) /* Is input source tainted? */ SvTAINT(sv); /* External data cannot be trusted */ - TRACEME(("large scalar len %"IVdf" '%s'", (IV) len, SvPVX(sv))); - TRACEME(("ok (retrieve_lscalar at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("large scalar len %" IVdf " '%s'", (IV) len, SvPVX(sv))); + TRACEME(("ok (retrieve_lscalar at 0x%" UVxf ")", PTR2UV(sv))); return sv; } @@ -4962,7 +4975,7 @@ static SV *retrieve_scalar(pTHX_ stcxt_t *cxt, const char *cname) } SvGROW(sv, 1); *SvEND(sv) = '\0'; /* Ensure it's null terminated anyway */ - TRACEME(("ok (retrieve_scalar empty at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("ok (retrieve_scalar empty at 0x%" UVxf ")", PTR2UV(sv))); } else { /* * Now, for efficiency reasons, read data directly inside the SV buffer, @@ -4980,7 +4993,7 @@ static SV *retrieve_scalar(pTHX_ stcxt_t *cxt, const char *cname) if (cxt->s_tainted) /* Is input source tainted? */ SvTAINT(sv); /* External data cannot be trusted */ - TRACEME(("ok (retrieve_scalar at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("ok (retrieve_scalar at 0x%" UVxf ")", PTR2UV(sv))); return sv; } @@ -5069,7 +5082,7 @@ static SV *retrieve_vstring(pTHX_ stcxt_t *cxt, const char *cname) /* 5.10.0 and earlier seem to need this */ SvRMAGICAL_on(sv); - TRACEME(("ok (retrieve_vstring at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("ok (retrieve_vstring at 0x%" UVxf ")", PTR2UV(sv))); return sv; #else VSTRING_CROAK(); @@ -5090,7 +5103,7 @@ static SV *retrieve_lvstring(pTHX_ stcxt_t *cxt, const char *cname) SV *sv; RLEN(len); - TRACEME(("retrieve_lvstring (#%d), len = %"IVdf, + TRACEME(("retrieve_lvstring (#%d), len = %" IVdf, cxt->tagnum, (IV)len)); New(10003, s, len+1, char); @@ -5104,7 +5117,7 @@ static SV *retrieve_lvstring(pTHX_ stcxt_t *cxt, const char *cname) Safefree(s); - TRACEME(("ok (retrieve_lvstring at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("ok (retrieve_lvstring at 0x%" UVxf ")", PTR2UV(sv))); return sv; #else VSTRING_CROAK(); @@ -5131,8 +5144,8 @@ static SV *retrieve_integer(pTHX_ stcxt_t *cxt, const char *cname) stash = cname ? gv_stashpv(cname, GV_ADD) : 0; SEEN_NN(sv, stash, 0); /* Associate this new scalar with tag "tagnum" */ - TRACEME(("integer %"IVdf, iv)); - TRACEME(("ok (retrieve_integer at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("integer %" IVdf, iv)); + TRACEME(("ok (retrieve_integer at 0x%" UVxf ")", PTR2UV(sv))); return sv; } @@ -5162,7 +5175,7 @@ static SV *retrieve_netint(pTHX_ stcxt_t *cxt, const char *cname) stash = cname ? gv_stashpv(cname, GV_ADD) : 0; SEEN_NN(sv, stash, 0); /* Associate this new scalar with tag "tagnum" */ - TRACEME(("ok (retrieve_netint at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("ok (retrieve_netint at 0x%" UVxf ")", PTR2UV(sv))); return sv; } @@ -5186,8 +5199,8 @@ static SV *retrieve_double(pTHX_ stcxt_t *cxt, const char *cname) stash = cname ? gv_stashpv(cname, GV_ADD) : 0; SEEN_NN(sv, stash, 0); /* Associate this new scalar with tag "tagnum" */ - TRACEME(("double %"NVff, nv)); - TRACEME(("ok (retrieve_double at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("double %" NVff, nv)); + TRACEME(("ok (retrieve_double at 0x%" UVxf ")", PTR2UV(sv))); return sv; } @@ -5215,7 +5228,7 @@ static SV *retrieve_byte(pTHX_ stcxt_t *cxt, const char *cname) SEEN_NN(sv, stash, 0); /* Associate this new scalar with tag "tagnum" */ TRACEME(("byte %d", tmp)); - TRACEME(("ok (retrieve_byte at 0x%"UVxf")", PTR2UV(sv))); + TRACEME(("ok (retrieve_byte at 0x%" UVxf ")", PTR2UV(sv))); return sv; } @@ -5368,7 +5381,7 @@ static SV *retrieve_array(pTHX_ stcxt_t *cxt, const char *cname) } if (seen_null) av_fill(av, len-1); - TRACEME(("ok (retrieve_array at 0x%"UVxf")", PTR2UV(av))); + TRACEME(("ok (retrieve_array at 0x%" UVxf ")", PTR2UV(av))); return (SV *) av; } @@ -5444,7 +5457,7 @@ static SV *retrieve_hash(pTHX_ stcxt_t *cxt, const char *cname) return (SV *) 0; } - TRACEME(("ok (retrieve_hash at 0x%"UVxf")", PTR2UV(hv))); + TRACEME(("ok (retrieve_hash at 0x%" UVxf ")", PTR2UV(hv))); return (SV *) hv; } @@ -5589,7 +5602,7 @@ static SV *retrieve_flag_hash(pTHX_ stcxt_t *cxt, const char *cname) SvREADONLY_on(hv); #endif - TRACEME(("ok (retrieve_hash at 0x%"UVxf")", PTR2UV(hv))); + TRACEME(("ok (retrieve_hash at 0x%" UVxf ")", PTR2UV(hv))); return (SV *) hv; } @@ -5776,7 +5789,7 @@ static SV *old_retrieve_array(pTHX_ stcxt_t *cxt, const char *cname) return (SV *) 0; } - TRACEME(("ok (old_retrieve_array at 0x%"UVxf")", PTR2UV(av))); + TRACEME(("ok (old_retrieve_array at 0x%" UVxf ")", PTR2UV(av))); return (SV *) av; } @@ -5871,7 +5884,7 @@ static SV *old_retrieve_hash(pTHX_ stcxt_t *cxt, const char *cname) return (SV *) 0; } - TRACEME(("ok (retrieve_hash at 0x%"UVxf")", PTR2UV(hv))); + TRACEME(("ok (retrieve_hash at 0x%" UVxf ")", PTR2UV(hv))); return (SV *) hv; } @@ -6110,7 +6123,7 @@ static SV *retrieve(pTHX_ stcxt_t *cxt, const char *cname) I32 tagn; svh = hv_fetch(cxt->hseen, (char *) &tag, sizeof(tag), FALSE); if (!svh) - CROAK(("Old tag 0x%"UVxf" should have been mapped already", + CROAK(("Old tag 0x%" UVxf " should have been mapped already", (UV) tag)); tagn = SvIV(*svh); /* Mapped tag number computed earlier below */ @@ -6120,10 +6133,12 @@ static SV *retrieve(pTHX_ stcxt_t *cxt, const char *cname) svh = av_fetch(cxt->aseen, tagn, FALSE); if (!svh) - CROAK(("Object #%"IVdf" should have been retrieved already", + CROAK(("Object #%" IVdf + " should have been retrieved already", (IV) tagn)); sv = *svh; - TRACEME(("has retrieved #%d at 0x%"UVxf, tagn, PTR2UV(sv))); + TRACEME(("has retrieved #%d at 0x%" UVxf, tagn, + PTR2UV(sv))); SvREFCNT_inc(sv); /* One more reference to this same sv */ return sv; /* The SV pointer where object was retrieved */ } @@ -6161,10 +6176,11 @@ static SV *retrieve(pTHX_ stcxt_t *cxt, const char *cname) tag = ntohl(tag); svh = av_fetch(cxt->aseen, tag, FALSE); if (!svh) - CROAK(("Object #%"IVdf" should have been retrieved already", + CROAK(("Object #%" IVdf + " should have been retrieved already", (IV) tag)); sv = *svh; - TRACEME(("had retrieved #%d at 0x%"UVxf, tag, PTR2UV(sv))); + TRACEME(("had retrieved #%d at 0x%" UVxf, tag, PTR2UV(sv))); SvREFCNT_inc(sv); /* One more reference to this same sv */ return sv; /* The SV pointer where object was retrieved */ } else if (type >= SX_ERROR && cxt->ver_minor > STORABLE_BIN_MINOR) { @@ -6227,7 +6243,7 @@ first_time: /* Will disappear when support for old format is dropped */ } } - TRACEME(("ok (retrieved 0x%"UVxf", refcnt=%d, %s)", PTR2UV(sv), + TRACEME(("ok (retrieved 0x%" UVxf ", refcnt=%d, %s)", PTR2UV(sv), SvREFCNT(sv) - 1, sv_reftype(sv, FALSE))); return sv; /* Ok */ @@ -6414,7 +6430,7 @@ static SV *do_retrieve( #endif } - TRACEME(("retrieve got %s(0x%"UVxf")", + TRACEME(("retrieve got %s(0x%" UVxf ")", sv_reftype(sv, FALSE), PTR2UV(sv))); /* @@ -6574,7 +6590,7 @@ static SV *dclone(pTHX_ SV *sv) cxt->s_tainted = SvTAINTED(sv); out = do_retrieve(aTHX_ (PerlIO*) 0, Nullsv, ST_CLONE); - TRACEME(("dclone returns 0x%"UVxf, PTR2UV(out))); + TRACEME(("dclone returns 0x%" UVxf, PTR2UV(out))); return out; } -- Perl5 Master Repository
