[svn-r15677] Description:

    Bring r15676 back from trunk:

        Centralize all macros for declaring "magic numbers"/signatures for
    objects in the file into src/H5Fprivate.h, so it's easier to know what
    values have already been defined, etc.

Tested on:
    Mac OS X/32 10.5.5 (amazon)
    Too minor to require h5committest

1 files changed, 5 insertions, 5 deletions

diff --git a/src/H5HG.c b/src/H5HG.c
index 26f0ac5..f867147 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -226,8 +226,8 @@ HDmemset(heap->chunk, 0, size);
                      "memory allocation failed");
 
     /* Initialize the header */
-    HDmemcpy (heap->chunk, H5HG_MAGIC, (size_t)H5HG_SIZEOF_MAGIC);
-    p = heap->chunk + H5HG_SIZEOF_MAGIC;
+    HDmemcpy (heap->chunk, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC);
+    p = heap->chunk + H5_SIZEOF_MAGIC;
     *p++ = H5HG_VERSION;
     *p++ = 0; /*reserved*/
     *p++ = 0; /*reserved*/
@@ -343,9 +343,9 @@ H5HG_load (H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED * udata1,
 	HGOTO_ERROR (H5E_HEAP, H5E_READERROR, NULL, "unable to read global heap collection");
 
     /* Magic number */
-    if(HDmemcmp(heap->chunk, H5HG_MAGIC, (size_t)H5HG_SIZEOF_MAGIC))
+    if(HDmemcmp(heap->chunk, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC))
 	HGOTO_ERROR (H5E_HEAP, H5E_CANTLOAD, NULL, "bad global heap collection signature");
-    p = heap->chunk + H5HG_SIZEOF_MAGIC;
+    p = heap->chunk + H5_SIZEOF_MAGIC;
 
     /* Version */
     if (H5HG_VERSION!=*p++)
@@ -845,7 +845,7 @@ HDmemset(new_chunk + heap->size, 0, need);
     heap->size+=need;
 
     /* Encode the new size of the heap */
-    p = new_chunk + H5HG_SIZEOF_MAGIC + 1 /* version */ + 3 /* reserved */;
+    p = new_chunk + H5_SIZEOF_MAGIC + 1 /* version */ + 3 /* reserved */;
     H5F_ENCODE_LENGTH (f, p, heap->size);
 
     /* Move the pointers to the existing objects to their new locations */