From aab7fd598fa513f2a4dfc3d0784587cd8ae8cadb Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sun, 9 Apr 2006 21:51:05 -0500 Subject: [svn-r12218] Purpose: Code cleanup Description: Remove remnents of references to unimplemented H5S_COMPLEX dataspace. Platforms tested: FreeBSD 4.11 (sleipnir) Linux 2.4 32-bit (heping) Linux 2.4 64-bit (mir) Solaris 2.9 (shanti) --- src/H5.c | 3 --- src/H5S.c | 19 ------------------- src/H5Smpio.c | 4 ---- src/H5Spublic.h | 3 +-- tools/h5dump/h5dump.c | 9 +-------- 5 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/H5.c b/src/H5.c index d2024ab..0d15029 100644 --- a/src/H5.c +++ b/src/H5.c @@ -2476,9 +2476,6 @@ H5_trace (const double *returning, const char *func, const char *type, ...) case H5S_NULL: fprintf(out, "H5S_NULL"); break; - case H5S_COMPLEX: - fprintf(out, "H5S_COMPLEX"); - break; default: fprintf(out, "%ld", (long)cls); break; diff --git a/src/H5S.c b/src/H5S.c index bc58fb8..b3060ef 100644 --- a/src/H5S.c +++ b/src/H5S.c @@ -636,10 +636,6 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src) dst->max=NULL; break; - case H5S_COMPLEX: - /*void */ - break; - default: assert("unknown data space type" && 0); break; @@ -832,9 +828,6 @@ H5S_get_npoints_max(const H5S_t *ds) } break; - case H5S_COMPLEX: - HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, 0, "complex data spaces are not supported yet"); - default: assert("unknown data space class" && 0); HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, 0, "internal error (unknown data space class)"); @@ -919,9 +912,6 @@ H5S_get_simple_extent_ndims(const H5S_t *ds) ret_value = ds->extent.rank; break; - case H5S_COMPLEX: - HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "complex data spaces are not supported yet"); - default: assert("unknown data space class" && 0); HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "internal error (unknown data space class)"); @@ -1023,9 +1013,6 @@ H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[]) } break; - case H5S_COMPLEX: - HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "complex data spaces are not supported yet"); - default: assert("unknown data space class" && 0); HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "internal error (unknown data space class)"); @@ -1067,9 +1054,6 @@ H5S_modify(H5O_loc_t *loc, const H5S_t *ds, hbool_t update_time, hid_t dxpl_id) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update simple dataspace message") break; - case H5S_COMPLEX: - HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "complex dataspaces are not implemented yet") - default: HDassert("unknown dataspace class" && 0); break; @@ -1121,9 +1105,6 @@ H5S_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, const H5S_t *ds, HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update simple data space message"); break; - case H5S_COMPLEX: - HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "complex data spaces are not implemented yet"); - default: assert("unknown data space class" && 0); break; diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 4c7f50b..f2e146c 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -815,10 +815,6 @@ H5S_mpio_space_type( const H5S_t *space, size_t elmt_size, } /* end switch */ break; - case H5S_COMPLEX: - /* not yet implemented */ - HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "complex data spaces are not supported yet"); - default: assert("unknown data space type" && 0); break; diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 5e2177f..9eb3705 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -34,8 +34,7 @@ typedef enum H5S_class_t { H5S_NO_CLASS = -1, /*error */ H5S_SCALAR = 0, /*scalar variable */ H5S_SIMPLE = 1, /*simple data space */ - H5S_NULL = 2, /*null data space */ - H5S_COMPLEX = 3 /*complex data space */ + H5S_NULL = 2 /*null data space */ } H5S_class_t; /* Different ways of combining selections */ diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index ed6fa6d..029990e 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -1163,9 +1163,6 @@ dump_dataspace(hid_t space) HDfprintf(stdout, "%s %s", dump_header_format->dataspacedescriptionbegin, S_NULL); break; - case H5S_COMPLEX: - printf("%s not yet implemented %s\n", BEGIN, END); - break; case H5S_NO_CLASS: default: printf("%s unknown dataspace %s\n", BEGIN, END); @@ -2035,7 +2032,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int pindex) /* need to call h5tools_dump_mem for the attribute data */ space = H5Aget_space(obj_id); space_type = H5Sget_simple_extent_type(space); - if(space_type == H5S_NULL || space_type == H5S_NO_CLASS || space_type == H5S_COMPLEX) { + if(space_type == H5S_NULL || space_type == H5S_NO_CLASS) { status = SUCCEED; } else { char string_prefix[64]; @@ -4497,10 +4494,6 @@ xml_dump_dataspace(hid_t space) break; #endif /* TMP */ - case H5S_COMPLEX: - printf("\n"); - - break; case H5S_NO_CLASS: default: printf("\n"); -- cgit v0.12