Update NSS to NSS 3.14 Beta 1.

mozilla/security/nss/lib/base/arena.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef DEBUG
 static const char CVS_ID[] = "@(#) $RCSfile: arena.c,v $ $Revision: 1.15 $ $Date: 2012/07/06 18:19:32 $";
 #endif /* DEBUG */
 
 /*
  * arena.c
@@ skipping 16 matching lines @@
 
 /*
  * NSSArena
  *
  * This is based on NSPR's arena code, but it is threadsafe.
  *
  * The public methods relating to this type are:
  *
  *  NSSArena_Create  -- constructor
  *  NSSArena_Destroy
+ *  NSS_ZAlloc
+ *  NSS_ZRealloc
+ *  NSS_ZFreeIf
  *
  * The nonpublic methods relating to this type are:
  *
  *  nssArena_Create  -- constructor
  *  nssArena_Destroy
  *  nssArena_Mark
  *  nssArena_Release
  *  nssArena_Unmark
  * 
  *  nss_ZAlloc
@@ skipping 763 matching lines @@
    */
   h = (struct pointer_header *)p;
   h->arena = arena;
   h->size = size;
   rv = (void *)((char *)h + sizeof(struct pointer_header));
   (void)nsslibc_memset(rv, 0, size);
   return rv;
 }
 
 /*
+ * NSS_ZAlloc
+ *
+ * This routine allocates and zeroes a section of memory of the 
+ * size, and returns to the caller a pointer to that memory.  If
+ * the optional arena argument is non-null, the memory will be
+ * obtained from that arena; otherwise, the memory will be obtained
+ * from the heap.  This routine may return NULL upon error, in
+ * which case it will have set an error upon the error stack.  The
+ * value specified for size may be zero; in which case a valid 
+ * zero-length block of memory will be allocated.  This block may
+ * be expanded by calling NSS_ZRealloc.
+ *
+ * The error may be one of the following values:
+ *  NSS_ERROR_INVALID_ARENA
+ *  NSS_ERROR_NO_MEMORY
+ *  NSS_ERROR_ARENA_MARKED_BY_ANOTHER_THREAD
+ *
+ * Return value:
+ *  NULL upon error
+ *  A pointer to the new segment of zeroed memory
+ */
+
+NSS_IMPLEMENT void *
+NSS_ZAlloc
+(
+  NSSArena *arenaOpt,
+  PRUint32 size
+)
+{
+  return nss_ZAlloc(arenaOpt, size);
+}
+
+/*
  * nss_ZAlloc
  *
  * This routine allocates and zeroes a section of memory of the 
  * size, and returns to the caller a pointer to that memory.  If
  * the optional arena argument is non-null, the memory will be
  * obtained from that arena; otherwise, the memory will be obtained
  * from the heap.  This routine may return NULL upon error, in
  * which case it will have set an error upon the error stack.  The
  * value specified for size may be zero; in which case a valid 
  * zero-length block of memory will be allocated.  This block may
@@ skipping 66 matching lines @@
 
     rv = nss_zalloc_arena_locked(arenaOpt, size);
 
     PR_Unlock(arenaOpt->lock);
     return rv;
   }
   /*NOTREACHED*/
 }
 
 /*
+ * NSS_ZFreeIf
+ *
+ * If the specified pointer is non-null, then the region of memory 
+ * to which it points -- which must have been allocated with 
+ * NSS_ZAlloc -- will be zeroed and released.  This routine 
+ * returns a PRStatus value; if successful, it will return PR_SUCCESS.
+ * If unsuccessful, it will set an error on the error stack and return 
+ * PR_FAILURE.
+ *
+ * The error may be one of the following values:
+ *  NSS_ERROR_INVALID_POINTER
+ *
+ * Return value:
+ *  PR_SUCCESS
+ *  PR_FAILURE
+ */
+NSS_IMPLEMENT PRStatus
+NSS_ZFreeIf
+(
+  void *pointer
+)
+{
+   return nss_ZFreeIf(pointer);
+}
+
+/*
  * nss_ZFreeIf
  *
  * If the specified pointer is non-null, then the region of memory 
  * to which it points -- which must have been allocated with 
  * nss_ZAlloc -- will be zeroed and released.  This routine 
  * returns a PRStatus value; if successful, it will return PR_SUCCESS.
  * If unsuccessful, it will set an error on the error stack and return 
  * PR_FAILURE.
  *
  * The error may be one of the following values:
@@ skipping 45 matching lines @@
 
     /* No way to "free" it within an NSPR arena. */
 
     PR_Unlock(h->arena->lock);
     return PR_SUCCESS;
   }
   /*NOTREACHED*/
 }
 
 /*
+ * NSS_ZRealloc
+ *
+ * This routine reallocates a block of memory obtained by calling
+ * nss_ZAlloc or nss_ZRealloc.  The portion of memory 
+ * between the new and old sizes -- which is either being newly
+ * obtained or released -- is in either case zeroed.  This routine 
+ * may return NULL upon failure, in which case it will have placed 
+ * an error on the error stack.
+ *
+ * The error may be one of the following values:
+ *  NSS_ERROR_INVALID_POINTER
+ *  NSS_ERROR_NO_MEMORY
+ *  NSS_ERROR_ARENA_MARKED_BY_ANOTHER_THREAD
+ *
+ * Return value:
+ *  NULL upon error
+ *  A pointer to the replacement segment of memory
+ */
+
+NSS_EXTERN void *
+NSS_ZRealloc
+(
+  void *pointer,
+  PRUint32 newSize
+)
+{
+    return nss_ZRealloc(pointer, newSize);
+}
+
+/*
  * nss_ZRealloc
  *
  * This routine reallocates a block of memory obtained by calling
  * nss_ZAlloc or nss_ZRealloc.  The portion of memory 
  * between the new and old sizes -- which is either being newly
  * obtained or released -- is in either case zeroed.  This routine 
  * may return NULL upon failure, in which case it will have placed 
  * an error on the error stack.
  *
  * The error may be one of the following values:
@@ skipping 136 matching lines @@
 
 PRStatus 
 nssArena_Shutdown(void)
 {
   PRStatus rv = PR_SUCCESS;
 #ifdef DEBUG
   rv = nssPointerTracker_finalize(&arena_pointer_tracker);
 #endif
   return rv;
 }