[svn-r8677] Purpose:

    Code cleanup & optimization

Description:
    Remove old structures that used a union to store information about the
dataspace extent and just store the information directly in the dataspace
extent itself.

    Remove ifdef'd references to permutation ordering in dataspaces.  We'll
definitely need more than this code if/when we implement this feature.

    Change allocation of dataspace information from calloc() to malloc().

Platforms tested:
    Solaris 2.7 (arabica)
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest

1 files changed, 4 insertions, 14 deletions

diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 72f9fd6..82bfec2 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -42,23 +42,14 @@
 /* 
  * Dataspace extent information
  */
-/* Simple extent container */
-typedef struct H5S_simple_t {
-    unsigned rank;         /* Number of dimensions */
-    hsize_t *size;      /* Current size of the dimensions */
-    hsize_t *max;       /* Maximum size of the dimensions */
-#ifdef LATER
-    hsize_t *perm;      /* Dimension permutation array */
-#endif /* LATER */
-} H5S_simple_t;
-
 /* Extent container */
 typedef struct {
     H5S_class_t	type;   /* Type of extent */
     hsize_t nelem;      /* Number of elements in extent */
-    union {
-        H5S_simple_t	simple;	/* Simple dimensionality information  */
-    } u;
+
+    unsigned rank;      /* Number of dimensions */
+    hsize_t *size;      /* Current size of the dimensions */
+    hsize_t *max;       /* Maximum size of the dimensions */
 } H5S_extent_t;
 
 /* 
@@ -227,7 +218,6 @@ H5_DLLVAR const H5S_select_class_t H5S_sel_none[1];
 H5_DLLVAR const H5S_select_class_t H5S_sel_point[1];
 
 /* Extent functions */
-H5_DLL herr_t H5S_close_simple(H5S_simple_t *simple);
 H5_DLL herr_t H5S_extent_release(H5S_extent_t *extent);
 H5_DLL herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src);