[svn-r463] H5S.c:

    Moved the source of H5S_extent_npoints before H5Sextent_npoints to
    reduce a compiler complaint.
H5Shyper.c:
H5Sprivate.h:
H5Spublic.h:
H5Sselect.c:
    Changed the parameter declarations of H5S_hyper_add
    and H5Sselect_hyperslab as originally intended as const hsize *.

1 files changed, 36 insertions, 35 deletions

diff --git a/src/H5S.c b/src/H5S.c
index 54bb777..632ab4f 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -425,41 +425,6 @@ H5S_t * H5S_copy(const H5S_t *src)
 
     FUNC_LEAVE(dst);
 }
-
-/*-------------------------------------------------------------------------
- * Function:	H5Sextent_npoints
- *
- * Purpose:	Determines how many data points a dataset extent has.
- *
- * Return:	Success:	Number of data points in the dataset.
- *
- *		Failure:	0
- *
- * Programmer:	Robb Matzke
- *		Tuesday, December  9, 1997
- *
- * Modifications:
- *  Changed Name - QAK 7/7/98
- *
- *-------------------------------------------------------------------------
- */
-hsize_t
-H5Sextent_npoints (hid_t space_id)
-{
-    H5S_t		   *ds = NULL;
-    hsize_t		    ret_value = 0;
-
-    FUNC_ENTER(H5Sextent_npoints, 0);
-    H5TRACE1("h","i",space_id);
-
-    /* Check args */
-    if (H5_DATASPACE != H5I_group(space_id) || NULL == (ds = H5I_object(space_id))) {
-        HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a data space");
-    }
-    ret_value = H5S_extent_npoints(ds);
-
-    FUNC_LEAVE(ret_value);
-}
 
 
 /*-------------------------------------------------------------------------
@@ -513,6 +478,42 @@ H5S_extent_npoints(const H5S_t *ds)
 
     FUNC_LEAVE(ret_value);
 }
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5Sextent_npoints
+ *
+ * Purpose:	Determines how many data points a dataset extent has.
+ *
+ * Return:	Success:	Number of data points in the dataset.
+ *
+ *		Failure:	0
+ *
+ * Programmer:	Robb Matzke
+ *		Tuesday, December  9, 1997
+ *
+ * Modifications:
+ *  Changed Name - QAK 7/7/98
+ *
+ *-------------------------------------------------------------------------
+ */
+hsize_t
+H5Sextent_npoints (hid_t space_id)
+{
+    H5S_t		   *ds = NULL;
+    hsize_t		    ret_value = 0;
+
+    FUNC_ENTER(H5Sextent_npoints, 0);
+    H5TRACE1("h","i",space_id);
+
+    /* Check args */
+    if (H5_DATASPACE != H5I_group(space_id) || NULL == (ds = H5I_object(space_id))) {
+        HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a data space");
+    }
+    ret_value = H5S_extent_npoints(ds);
+
+    FUNC_LEAVE(ret_value);
+}
 
 /*-------------------------------------------------------------------------
  * Function:	H5S_get_npoints_max