[svn-r4620] Purpose:

    Code cleanup
Description:
    Get rid of IDs from internal function calls and some small cleanups from
    the old-stype => generic property list conversion.
Platforms tested:
    FreeBSD 4.4 (hawkwind)

1 files changed, 8 insertions, 2 deletions

diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 5f89957..06f198d 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -11,12 +11,13 @@
 #define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
 
 #include "H5private.h"
+#include "H5Dprivate.h"
 #include "H5Eprivate.h"
 #include "H5Iprivate.h"
 #include "H5MMprivate.h"
 #include "H5Spkg.h"
+#include "H5Tprivate.h"         /* Datatypes */
 #include "H5Vprivate.h"
-#include "H5Dprivate.h"
 
 /* Interface initialization */
 #define PABLO_MASK      H5Spoint_mask
@@ -1314,6 +1315,7 @@ H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t
     void *tmp_buf;              /* temporary location of the element in the buffer */
     H5S_pnt_node_t *node;   /* Point node */
     unsigned rank;             /* Dataspace rank */
+    H5T_t *dt;                  /* Datatype structure */
     herr_t ret_value=0;     /* return value */
 
     FUNC_ENTER (H5S_point_select_iterate, 0);
@@ -1328,7 +1330,11 @@ H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t
 
     /* Set up the size of the memory space */
     HDmemcpy(mem_size, space->extent.u.simple.size, rank*sizeof(hsize_t));
-    mem_size[rank]=H5Tget_size(type_id);
+
+    /* Set the size of the datatype */
+    if (NULL==(dt=H5I_object(type_id)))
+        HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype");
+    mem_size[rank]=H5T_get_size(dt);
 
     /* Iterate through the node, checking the bounds on each element */
     node=space->select.sel_info.pnt_lst->head;