[svn-r4326] Purpose:

    Code cleanups, mostly..
Description:
    Work on pacifying the SGI compiler to get the generic properties working
    correctly with --enable-parallel and --enable-fortran.  It's not quite
    fixed yet, but I need to head home and these patches help... :-/
Platforms tested:
    IRIX64 6.5 (modi4)

6 files changed, 21 insertions, 20 deletions

diff --git a/src/H5Dseq.c b/src/H5Dseq.c
index f33005a..2cb1b17 100644
--- a/src/H5Dseq.c
+++ b/src/H5Dseq.c
@@ -184,13 +184,13 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 
         /* Get the driver ID */
         if(H5P_get(dxpl_id, H5D_XFER_VFL_ID_NAME, &driver_id)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
+            HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
 
         /* Check if we are using the MPIO driver */
         if(H5FD_MPIO==driver_id) {
             /* Get the driver information */
             if(H5P_get(dxpl_id, H5D_XFER_VFL_INFO_NAME, &dx)<0)
-                HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
+                HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
 
             /* Check if we are not using independent I/O */
             if(H5FD_MPIO_INDEPENDENT!=dx->xfer_mode)
@@ -558,13 +558,13 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 
         /* Get the driver ID */
         if(H5P_get(dxpl_id, H5D_XFER_VFL_ID_NAME, &driver_id)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
+            HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
 
         /* Check if we are using the MPIO driver */
         if(H5FD_MPIO==driver_id) {
             /* Get the driver information */
             if(H5P_get(dxpl_id, H5D_XFER_VFL_INFO_NAME, &dx)<0)
-                HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
+                HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
 
             /* Check if we are not using independent I/O */
             if(H5FD_MPIO_INDEPENDENT!=dx->xfer_mode)
diff --git a/src/H5Farray.c b/src/H5Farray.c
index 03b5751..6b178aa 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -180,13 +180,13 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 
         /* Get the driver ID */
         if(H5P_get(dxpl_id, H5D_XFER_VFL_ID_NAME, &driver_id)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
+            HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
 
         /* Check if we are using the MPIO driver */
         if(H5FD_MPIO==driver_id) {
             /* Get the driver information */
             if(H5P_get(dxpl_id, H5D_XFER_VFL_INFO_NAME, &dx)<0)
-                HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
+                HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
 
             /* Check if we are not using independent I/O */
             if(H5FD_MPIO_INDEPENDENT!=dx->xfer_mode)
@@ -309,7 +309,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 
             /* Track the number of reads to gather */
             if(H5P_set(dxpl_id, H5D_XFER_GATHER_READS_NAME, &gather_reads)<0)
-                HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve gather reads");
+                HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve gather reads");
 
 #else
             for (z=0; z<nelmts; z++) {
@@ -467,13 +467,13 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 
         /* Get the driver ID */
         if(H5P_get(dxpl_id, H5D_XFER_VFL_ID_NAME, &driver_id)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
+            HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
 
         /* Check if we are using the MPIO driver */
         if(H5FD_MPIO==driver_id) {
             /* Get the driver information */
             if(H5P_get(dxpl_id, H5D_XFER_VFL_INFO_NAME, &dx)<0)
-                HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
+                HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
 
             /* Check if we are not using independent I/O */
             if(H5FD_MPIO_INDEPENDENT!=dx->xfer_mode)
diff --git a/src/H5Fseq.c b/src/H5Fseq.c
index f33005a..2cb1b17 100644
--- a/src/H5Fseq.c
+++ b/src/H5Fseq.c
@@ -184,13 +184,13 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 
         /* Get the driver ID */
         if(H5P_get(dxpl_id, H5D_XFER_VFL_ID_NAME, &driver_id)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
+            HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
 
         /* Check if we are using the MPIO driver */
         if(H5FD_MPIO==driver_id) {
             /* Get the driver information */
             if(H5P_get(dxpl_id, H5D_XFER_VFL_INFO_NAME, &dx)<0)
-                HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
+                HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
 
             /* Check if we are not using independent I/O */
             if(H5FD_MPIO_INDEPENDENT!=dx->xfer_mode)
@@ -558,13 +558,13 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
 
         /* Get the driver ID */
         if(H5P_get(dxpl_id, H5D_XFER_VFL_ID_NAME, &driver_id)<0)
-            HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
+            HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver ID");
 
         /* Check if we are using the MPIO driver */
         if(H5FD_MPIO==driver_id) {
             /* Get the driver information */
             if(H5P_get(dxpl_id, H5D_XFER_VFL_INFO_NAME, &dx)<0)
-                HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
+                HRETURN_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve VFL driver info");
 
             /* Check if we are not using independent I/O */
             if(H5FD_MPIO_INDEPENDENT!=dx->xfer_mode)
diff --git a/src/H5HG.c b/src/H5HG.c
index 7aec212..bc5b5a1 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -984,9 +984,9 @@ H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, intn indent,
 	    if (u>maxobj) maxobj = u;
 	}
     }
-    fprintf (stream, "%*s%-*s %u/%u/", indent, "", fwidth,
+    fprintf (stream, "%*s%-*s %u/%lu/", indent, "", fwidth,
 	     "Objects defined/allocated/max:",
-	     nused, h->nalloc);
+	     nused, (unsigned long)h->nalloc);
     fprintf (stream, nused ? "%u\n": "NA\n", maxobj);
 
     fprintf (stream, "%*s%-*s %lu\n", indent, "", fwidth,
diff --git a/src/H5O.c b/src/H5O.c
index b354231..f7fb44eb8 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -417,7 +417,7 @@ H5O_load(H5F_t *f, haddr_t addr, const void UNUSED *_udata1,
 
 	/* increase chunk array size */
 	if (oh->nchunks >= oh->alloc_nchunks) {
-	    size_t na = oh->alloc_nchunks + H5O_NCHUNKS;
+	    uintn na = oh->alloc_nchunks + H5O_NCHUNKS;
 	    H5O_chunk_t *x = H5FL_ARR_REALLOC (H5O_chunk_t, oh->chunk, na);
 
 	    if (!x) {
@@ -1722,7 +1722,7 @@ H5O_alloc_extend_chunk(H5O_t *oh, uintn chunkno, size_t size)
 
     /* create a new null message */
     if (oh->nmesgs >= oh->alloc_nmesgs) {
-        size_t na = oh->alloc_nmesgs + H5O_NMESGS;
+        uintn na = oh->alloc_nmesgs + H5O_NMESGS;
         H5O_mesg_t *x = H5FL_ARR_REALLOC (H5O_mesg_t, oh->mesg, na);
 
         if (NULL==x) {
@@ -1863,7 +1863,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size)
      * Create the new chunk without giving it a file address.
      */
     if (oh->nchunks >= oh->alloc_nchunks) {
-        size_t na = oh->alloc_nchunks + H5O_NCHUNKS;
+        uintn na = oh->alloc_nchunks + H5O_NCHUNKS;
         H5O_chunk_t *x = H5FL_ARR_REALLOC (H5O_chunk_t, oh->chunk, na);
 
         if (!x) {
@@ -1888,7 +1888,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size)
      */
     if (oh->nmesgs + 3 > oh->alloc_nmesgs) {
         int old_alloc=oh->alloc_nmesgs;
-        size_t na = oh->alloc_nmesgs + MAX (H5O_NMESGS, 3);
+        uintn na = oh->alloc_nmesgs + MAX (H5O_NMESGS, 3);
         H5O_mesg_t *x = H5FL_ARR_REALLOC (H5O_mesg_t, oh->mesg, na);
 
         if (!x) {
@@ -2046,7 +2046,7 @@ H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size)
 
 	if (oh->nmesgs >= oh->alloc_nmesgs) {
 	    int old_alloc=oh->alloc_nmesgs;
-	    size_t na = oh->alloc_nmesgs + H5O_NMESGS;
+	    uintn na = oh->alloc_nmesgs + H5O_NMESGS;
 	    H5O_mesg_t *x = H5FL_ARR_REALLOC (H5O_mesg_t, oh->mesg, na);
 
 	    if (!x) {
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 16bbda7..e4600ea 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -17,6 +17,7 @@
 #include "H5Eprivate.h"
 #include "H5Fpkg.h"         /* Ugly, but necessary for the MPIO I/O accesses */
 #include "H5FDprivate.h"    /* Necessary for the H5FD_write & H5FD_read prototypes.. */
+#include "H5Pprivate.h"		/* Property Lists */
 #include "H5Spkg.h"
 
 #include "H5FDmpio.h"		/*the MPIO file driver			*/