X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hv.c;h=32503a9366c24aa866e72cbff0bff69259ae69ba;hb=b2b4ec814a5af6e0a2f7557c1a67c4b86af2f630;hp=ee332c257f8a5b19d648ca3db8342fb16a6acca2;hpb=d75ce6849c410bc036e31e277356c75cd948ff95;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hv.c b/hv.c
index ee332c2..32503a9 100644
--- a/hv.c
+++ b/hv.c
@@ -41,7 +41,7 @@ S_more_he(pTHX)
 {
     HE* he;
     HE* heend;
-    New(54, he, PERL_ARENA_SIZE/sizeof(HE), HE);
+    Newx(he, PERL_ARENA_SIZE/sizeof(HE), HE);
     HeNEXT(he) = PL_he_arenaroot;
     PL_he_arenaroot = he;
 
@@ -94,7 +94,7 @@ S_save_hek_flags(pTHX_ const char *str, I32 len, U32 hash, int flags)
     char *k;
     register HEK *hek;
 
-    New(54, k, HEK_BASESIZE + len + 2, char);
+    Newx(k, HEK_BASESIZE + len + 2, char);
     hek = (HEK*)k;
     Copy(str, HEK_KEY(hek), len, char);
     HEK_KEY(hek)[len] = 0;
@@ -163,7 +163,7 @@ Perl_he_dup(pTHX_ HE *e, bool shared, CLONE_PARAMS* param)
     HeNEXT(ret) = he_dup(HeNEXT(e),shared, param);
     if (HeKLEN(e) == HEf_SVKEY) {
 	char *k;
-	New(54, k, HEK_BASESIZE + sizeof(SV*), char);
+	Newx(k, HEK_BASESIZE + sizeof(SV*), char);
 	HeKEY_hek(ret) = (HEK*)k;
 	HeKEY_sv(ret) = SvREFCNT_inc(sv_dup(HeKEY_sv(e), param));
     }
@@ -464,7 +464,7 @@ S_hv_fetch_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 		else {
 		    char *k;
 		    entry = new_HE();
-		    New(54, k, HEK_BASESIZE + sizeof(SV*), char);
+		    Newx(k, HEK_BASESIZE + sizeof(SV*), char);
 		    HeKEY_hek(entry) = (HEK*)k;
 		}
 		HeNEXT(entry) = Nullhe;
@@ -609,7 +609,7 @@ S_hv_fetch_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 #endif
 								  ) {
 	    char *array;
-	    Newz(503, array,
+	    Newxz(array,
 		 PERL_HV_ARRAY_ALLOC_BYTES(xhv->xhv_max+1 /* HvMAX(hv)+1 */),
 		 char);
 	    HvARRAY(hv) = (HE**)array;
@@ -789,7 +789,7 @@ S_hv_fetch_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 	   NULL is for %ENV with dynamic env fetch.  But that should disappear
 	   with magic in the previous code.  */
 	char *array;
-	Newz(503, array,
+	Newxz(array,
 	     PERL_HV_ARRAY_ALLOC_BYTES(xhv->xhv_max+1 /* HvMAX(hv)+1 */),
 	     char);
 	HvARRAY(hv) = (HE**)array;
@@ -1155,7 +1155,7 @@ S_hsplit(pTHX_ HV *hv)
 	Copy(&a[oldsize * sizeof(HE*)], &a[newsize * sizeof(HE*)], 1, struct xpvhv_aux);
     }
 #else
-    New(2, a, PERL_HV_ARRAY_ALLOC_BYTES(newsize)
+    Newx(a, PERL_HV_ARRAY_ALLOC_BYTES(newsize)
 	+ (SvOOK(hv) ? sizeof(struct xpvhv_aux) : 0), char);
     if (!a) {
       PL_nomemok = FALSE;
@@ -1233,7 +1233,7 @@ S_hsplit(pTHX_ HV *hv)
       longest_chain, HvTOTALKEYS(hv), HvFILL(hv),  1+HvMAX(hv));*/
 
     ++newsize;
-    Newz(2, a, PERL_HV_ARRAY_ALLOC_BYTES(newsize)
+    Newxz(a, PERL_HV_ARRAY_ALLOC_BYTES(newsize)
 	 + (SvOOK(hv) ? sizeof(struct xpvhv_aux) : 0), char);
     if (SvOOK(hv)) {
 	Copy(HvAUX(hv), &a[newsize * sizeof(HE*)], 1, struct xpvhv_aux);
@@ -1261,7 +1261,7 @@ S_hsplit(pTHX_ HV *hv)
 
 	    if (was_shared) {
 		/* Unshare it.  */
-		HEK *new_hek
+		HEK * const new_hek
 		    = save_hek_flags(HeKEY(entry), HeKLEN(entry),
 				     hash, HeKFLAGS(entry));
 		unshare_hek (HeKEY_hek(entry));
@@ -1325,7 +1325,7 @@ Perl_hv_ksplit(pTHX_ HV *hv, IV newmax)
 	    Copy(&a[oldsize * sizeof(HE*)], &a[newsize * sizeof(HE*)], 1, struct xpvhv_aux);
 	}
 #else
-	New(2, a, PERL_HV_ARRAY_ALLOC_BYTES(newsize)
+	Newx(a, PERL_HV_ARRAY_ALLOC_BYTES(newsize)
 	    + (SvOOK(hv) ? sizeof(struct xpvhv_aux) : 0), char);
 	if (!a) {
 	  PL_nomemok = FALSE;
@@ -1347,7 +1347,7 @@ Perl_hv_ksplit(pTHX_ HV *hv, IV newmax)
 	Zero(&a[oldsize * sizeof(HE*)], (newsize-oldsize) * sizeof(HE*), char); /* zero 2nd half*/
     }
     else {
-	Newz(0, a, PERL_HV_ARRAY_ALLOC_BYTES(newsize), char);
+	Newxz(a, PERL_HV_ARRAY_ALLOC_BYTES(newsize), char);
     }
     xhv->xhv_max = --newsize; 	/* HvMAX(hv) = --newsize */
     HvARRAY(hv) = (HE **) a;
@@ -1417,14 +1417,15 @@ Perl_newHVhv(pTHX_ HV *ohv)
 	/* It's an ordinary hash, so copy it fast. AMS 20010804 */
 	STRLEN i;
 	const bool shared = !!HvSHAREKEYS(ohv);
-	HE **ents, **oents = (HE **)HvARRAY(ohv);
+	HE **ents, ** const oents = (HE **)HvARRAY(ohv);
 	char *a;
-	New(0, a, PERL_HV_ARRAY_ALLOC_BYTES(hv_max+1), char);
+	Newx(a, PERL_HV_ARRAY_ALLOC_BYTES(hv_max+1), char);
 	ents = (HE**)a;
 
 	/* In each bucket... */
 	for (i = 0; i <= hv_max; i++) {
-	    HE *prev = NULL, *ent = NULL, *oent = oents[i];
+	    HE *prev = NULL, *ent = NULL;
+	    HE *oent = oents[i];
 
 	    if (!oent) {
 		ents[i] = NULL;
@@ -1432,7 +1433,7 @@ Perl_newHVhv(pTHX_ HV *ohv)
 	    }
 
 	    /* Copy the linked list of entries. */
-	    for (oent = oents[i]; oent; oent = HeNEXT(oent)) {
+	    for (; oent; oent = HeNEXT(oent)) {
 		const U32 hash   = HeHASH(oent);
 		const char * const key = HeKEY(oent);
 		const STRLEN len = HeKLEN(oent);
@@ -1456,7 +1457,7 @@ Perl_newHVhv(pTHX_ HV *ohv)
 	HvFILL(hv)  = hv_fill;
 	HvTOTALKEYS(hv)  = HvTOTALKEYS(ohv);
 	HvARRAY(hv) = ents;
-    }
+    } /* not magical */
     else {
 	/* Iterate over ohv, copying keys and values one at a time. */
 	HE *entry;
@@ -1647,8 +1648,7 @@ S_hfreeentries(pTHX_ HV *hv)
     I32 riter;
     I32 max;
     struct xpvhv_aux *iter;
-    if (!hv)
-	return;
+
     if (!HvARRAY(hv))
 	return;
 
@@ -1668,7 +1668,7 @@ S_hfreeentries(pTHX_ HV *hv)
     entry = array[0];
     for (;;) {
 	if (entry) {
-	    register HE *oentry = entry;
+	    register HE * const oentry = entry;
 	    entry = HeNEXT(entry);
 	    hv_free_ent(hv, oentry);
 	}
@@ -1730,7 +1730,7 @@ Perl_hv_undef(pTHX_ HV *hv)
     if ((name = HvNAME_get(hv))) {
         if(PL_stashcache)
 	    hv_delete(PL_stashcache, name, HvNAMELEN_get(hv), G_DISCARD);
-	Perl_hv_name_set(aTHX_ hv, 0, 0, 0);
+	Perl_hv_name_set(aTHX_ hv, Nullch, 0, 0);
     }
     SvFLAGS(hv) &= ~SVf_OOK;
     Safefree(HvARRAY(hv));
@@ -1748,7 +1748,7 @@ S_hv_auxinit(pTHX_ HV *hv) {
     char *array;
 
     if (!HvARRAY(hv)) {
-	Newz(0, array, PERL_HV_ARRAY_ALLOC_BYTES(HvMAX(hv) + 1)
+	Newxz(array, PERL_HV_ARRAY_ALLOC_BYTES(HvMAX(hv) + 1)
 	    + sizeof(struct xpvhv_aux), char);
     } else {
 	array = (char *) HvARRAY(hv);
@@ -1872,7 +1872,8 @@ Perl_hv_name_set(pTHX_ HV *hv, const char *name, I32 len, int flags)
 {
     struct xpvhv_aux *iter;
     U32 hash;
-    (void)flags;
+
+    PERL_UNUSED_ARG(flags);
 
     if (SvOOK(hv)) {
 	iter = HvAUX(hv);
@@ -1963,7 +1964,7 @@ Perl_hv_iternext_flags(pTHX_ HV *hv, I32 flags)
 	    /* one HE per MAGICAL hash */
 	    iter->xhv_eiter = entry = new_HE(); /* HvEITER(hv) = new_HE() */
 	    Zero(entry, 1, HE);
-	    Newz(54, k, HEK_BASESIZE + sizeof(SV*), char);
+	    Newxz(k, HEK_BASESIZE + sizeof(SV*), char);
 	    hek = (HEK*)k;
 	    HeKEY_hek(entry) = hek;
 	    HeKLEN(entry) = HEf_SVKEY;
@@ -1982,8 +1983,17 @@ Perl_hv_iternext_flags(pTHX_ HV *hv, I32 flags)
 	return Null(HE*);
     }
 #ifdef DYNAMIC_ENV_FETCH  /* set up %ENV for iteration */
-    if (!entry && SvRMAGICAL((SV*)hv) && mg_find((SV*)hv, PERL_MAGIC_env))
+    if (!entry && SvRMAGICAL((SV*)hv) && mg_find((SV*)hv, PERL_MAGIC_env)) {
 	prime_env_iter();
+#ifdef VMS
+	/* The prime_env_iter() on VMS just loaded up new hash values
+	 * so the iteration count needs to be reset back to the beginning
+	 */
+	hv_iterinit(hv);
+	iter = HvAUX(hv);
+	oldentry = entry = iter->xhv_eiter; /* HvEITER(hv) */
+#endif
+    }
 #endif
 
     /* hv_iterint now ensures this.  */
@@ -2176,7 +2186,7 @@ S_unshare_hek_or_pvn(pTHX_ const HEK *hek, const char *str, I32 len, U32 hash)
     bool found = 0;
     bool is_utf8 = FALSE;
     int k_flags = 0;
-    const char *save = str;
+    const char * const save = str;
     struct shared_he *he = 0;
 
     if (hek) {
@@ -2275,7 +2285,7 @@ Perl_share_hek(pTHX_ const char *str, I32 len, register U32 hash)
 {
     bool is_utf8 = FALSE;
     int flags = 0;
-    const char *save = str;
+    const char * const save = str;
 
     if (len < 0) {
       STRLEN tmplen = -len;
@@ -2344,7 +2354,7 @@ S_share_hek_flags(pTHX_ const char *str, I32 len, register U32 hash, int flags)
 	   HEK directly from the HE.
 	*/
 
-	New(0, k, STRUCT_OFFSET(struct shared_he,
+	Newx(k, STRUCT_OFFSET(struct shared_he,
 				shared_he_hek.hek_key[0]) + len + 2, char);
 	new_entry = (struct shared_he *)k;
 	entry = &(new_entry->shared_he_he);