[svn-r9727] Purpose:

    Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)

Description:
    Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation.  So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.

    I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
    FreeBSD 4.10 (sleipnir) w/threadsafe
    FreeBSD 4.10 (sleipnir) w/backward compatibility
    Solaris 2.7 (arabica) w/"purify options"
    Solaris 2.8 (sol) w/FORTRAN & C++
    AIX 5.x (copper) w/parallel & FORTRAN
    IRIX64 6.5 (modi4) w/FORTRAN
    Linux 2.4 (heping) w/FORTRAN & C++


Misc. update:

1 files changed, 19 insertions, 19 deletions

diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index d8b86b5..df93eae 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -261,28 +261,28 @@ nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock,
  *---------------------------------------------------------------------------*/
 
 int_f 
-nh5sget_select_bounds_c( hid_t_f *space_id , hssize_t_f * start, hssize_t_f * end)
+nh5sget_select_bounds_c( hid_t_f *space_id , hsize_t_f * start, hsize_t_f * end)
 {
   int ret_value = -1;
   hid_t c_space_id;
-  hssize_t* c_start, *c_end;
+  hsize_t* c_start, *c_end;
   int i, rank;
 
   c_space_id = *space_id;
   rank = H5Sget_simple_extent_ndims(c_space_id);
   if (rank < 0 ) return ret_value;
 
-  c_start =(hssize_t*) malloc(sizeof(hssize_t)*rank);
+  c_start =(hsize_t*) malloc(sizeof(hsize_t)*rank);
   if (!c_start) return ret_value;
 
-  c_end = (hssize_t*)malloc(sizeof(hssize_t)*rank);
+  c_end = (hsize_t*)malloc(sizeof(hsize_t)*rank);
   if(!c_end) return ret_value;
 
   ret_value = H5Sget_select_bounds(c_space_id, c_start, c_end);
   for(i = 0; i < rank; i++)
   {
-    start[i] = (hssize_t_f)(c_start[i]+1);
-    end[i] = (hssize_t_f)(c_end[i]+1);
+    start[i] = (hsize_t_f)(c_start[i]+1);
+    end[i] = (hsize_t_f)(c_end[i]+1);
   }
   if (ret_value  >= 0  ) ret_value = 0;
 
@@ -756,11 +756,11 @@ nh5sset_extent_none_c ( hid_t_f *space_id )
  *---------------------------------------------------------------------------*/
 
 int_f 
-nh5sselect_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block)
+nh5sselect_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block)
 {
   int ret_value = -1;
   hid_t c_space_id;
-  hssize_t *c_start = NULL;
+  hsize_t *c_start = NULL;
   hsize_t *c_count = NULL;
   hsize_t *c_stride = NULL;
   hsize_t *c_block = NULL; 
@@ -772,7 +772,7 @@ nh5sselect_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsize
 
   rank = H5Sget_simple_extent_ndims(*space_id);
   if (rank < 0 ) return ret_value;
-  c_start = (hssize_t *)HDmalloc(sizeof(hssize_t)*rank);
+  c_start = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
   if (c_start == NULL) goto DONE;
 
   c_count = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
@@ -791,7 +791,7 @@ nh5sselect_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsize
 
   for (i=0; i < rank; i++) {
       int t= (rank - i) - 1;
-      c_start[i] = (hssize_t)start[t];
+      c_start[i] = (hsize_t)start[t];
       c_count[i] = (hsize_t)count[t];
       c_stride[i] = (hsize_t)stride[t];
       c_block[i] = (hsize_t)block[t];
@@ -831,12 +831,12 @@ DONE:
  *---------------------------------------------------------------------------*/
 
 int_f 
-nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id)
+nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id)
 {
   int ret_value = -1;
   hid_t c_space_id;
   hid_t c_hyper_id;
-  hssize_t *c_start = NULL;
+  hsize_t *c_start = NULL;
   hsize_t *c_count = NULL;
   hsize_t *c_stride = NULL;
   hsize_t *c_block = NULL; 
@@ -848,7 +848,7 @@ nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsiz
 
   rank = H5Sget_simple_extent_ndims(*space_id);
   if (rank < 0 ) return ret_value;
-  c_start = (hssize_t *)HDmalloc(sizeof(hssize_t)*rank);
+  c_start = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
   if (c_start == NULL) goto DONE;
 
   c_count = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
@@ -867,7 +867,7 @@ nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsiz
 
   for (i=0; i < rank; i++) {
       int t= (rank - i) - 1;
-      c_start[i] = (hssize_t)start[t];
+      c_start[i] = (hsize_t)start[t];
       c_count[i] = (hsize_t)count[t];
       c_stride[i] = (hsize_t)stride[t];
       c_block[i] = (hsize_t)block[t];
@@ -991,7 +991,7 @@ nh5sget_select_type_c ( hid_t_f *space_id , int_f *type)
  *---------------------------------------------------------------------------*/
 
 int_f 
-nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hssize_t_f *coord)
+nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hsize_t_f *coord)
 {
   int ret_value = -1;
   hid_t c_space_id;
@@ -999,7 +999,7 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hss
   herr_t  status;
   int rank;
   int i, j;
-  hssize_t *c_coord;
+  hsize_t *c_coord;
   size_t c_nelements;
 /*
   if (*op != H5S_SELECT_SET_F) return ret_value;
@@ -1010,16 +1010,16 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hss
   c_space_id = *space_id;
   rank = H5Sget_simple_extent_ndims(c_space_id);
 
-  c_coord = malloc(sizeof(hssize_t)*rank*(*nelements));
+  c_coord = malloc(sizeof(hsize_t)*rank*(*nelements));
   if(!c_coord) return ret_value;
   for (i=0; i< *nelements; i++) {
       for (j = 0; j < rank; j++) {
-          c_coord[j+i*rank] = (hssize_t)coord[j + i*rank];
+          c_coord[j+i*rank] = (hsize_t)coord[j + i*rank];
       }
   }
 
   c_nelements = *nelements;
-  status = H5Sselect_elements(c_space_id, c_op, c_nelements, (const hssize_t **)c_coord);
+  status = H5Sselect_elements(c_space_id, c_op, c_nelements, (const hsize_t **)c_coord);
   if ( status >= 0  ) ret_value = 0;
   HDfree(c_coord); 
   return ret_value;