summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-08-27 04:52:45 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2020-08-27 04:52:45 (GMT)
commit593f6f68d0b07b4056d0beb761a53d8b00aa8513 (patch)
tree694f4d5793ef0046ab195c6849a6dc4999ae8686
parent5f806090d78dfe3c778549a6d283698b211377d1 (diff)
parent038ee0a5af3c70ae3a4f904a6a0329651e69fbc2 (diff)
downloadhdf5-593f6f68d0b07b4056d0beb761a53d8b00aa8513.zip
hdf5-593f6f68d0b07b4056d0beb761a53d8b00aa8513.tar.gz
hdf5-593f6f68d0b07b4056d0beb761a53d8b00aa8513.tar.bz2
Merge pull request #2855 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:yank_binary_compat_id_enum_val to hdf5_1_10
* commit '038ee0a5af3c70ae3a4f904a6a0329651e69fbc2': Removes unused H5I_SPACE_SEL_ITER value from H5I_type_t
-rw-r--r--src/H5Fint.c1
-rw-r--r--src/H5Gloc.c3
-rw-r--r--src/H5Gname.c1
-rw-r--r--src/H5Gtest.c1
-rw-r--r--src/H5I.c1
-rw-r--r--src/H5Ipublic.h1
-rw-r--r--src/H5O.c1
-rw-r--r--src/H5Oflush.c1
-rw-r--r--src/H5Oint.c1
-rw-r--r--src/H5T.c1
-rw-r--r--src/H5trace.c8
-rw-r--r--test/links.c2
-rw-r--r--test/tfile.c1
13 files changed, 0 insertions, 23 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 8b9d923..eaa5a02 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -570,7 +570,6 @@ H5F__get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5_ITER_ERROR, "unknown or invalid data object")
diff --git a/src/H5Gloc.c b/src/H5Gloc.c
index 51728ca..e672c67 100644
--- a/src/H5Gloc.c
+++ b/src/H5Gloc.c
@@ -234,9 +234,6 @@ H5G_loc(hid_t loc_id, H5G_loc_t *loc)
case H5I_VFL:
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of a virtual file driver (VFD)")
- case H5I_SPACE_SEL_ITER:
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of a dataspace selection iterator")
-
case H5I_REFERENCE:
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of reference")
diff --git a/src/H5Gname.c b/src/H5Gname.c
index c7e2cab..263bc11 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -835,7 +835,6 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown data object")
diff --git a/src/H5Gtest.c b/src/H5Gtest.c
index 654b0af..bea7780 100644
--- a/src/H5Gtest.c
+++ b/src/H5Gtest.c
@@ -615,7 +615,6 @@ H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsign
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown data object type")
diff --git a/src/H5I.c b/src/H5I.c
index 0ce083f..6a519cc 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -2157,7 +2157,6 @@ H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
break; /* Other types of IDs are not stored in files */
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index 8eb6e6f..7acca3a 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -49,7 +49,6 @@ typedef enum H5I_type_t {
H5I_ERROR_CLASS, /* type ID for error classes */
H5I_ERROR_MSG, /* type ID for error messages */
H5I_ERROR_STACK, /* type ID for error stacks */
- H5I_SPACE_SEL_ITER, /* type ID for dataspace selection iterator */
H5I_NTYPES /* number of library types, MUST BE LAST! */
} H5I_type_t;
diff --git a/src/H5O.c b/src/H5O.c
index 2a4b7e1..699e22b 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -941,7 +941,6 @@ H5Oclose(hid_t object_id)
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_CANTRELEASE, FAIL, "not a valid file object ID (dataset, group, or datatype)")
diff --git a/src/H5Oflush.c b/src/H5Oflush.c
index 82b34ce..b7bbdbe 100644
--- a/src/H5Oflush.c
+++ b/src/H5Oflush.c
@@ -450,7 +450,6 @@ H5O_refresh_metadata_reopen(hid_t oid, H5G_loc_t *obj_loc, hbool_t start_swmr)
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL, "not a valid file object ID (dataset, group, or datatype)")
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 8a641bf..187cacf 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -1837,7 +1837,6 @@ H5O_get_loc(hid_t object_id)
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, NULL, "invalid object type")
diff --git a/src/H5T.c b/src/H5T.c
index f2b5e10..776a84e 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1703,7 +1703,6 @@ H5Tcopy(hid_t obj_id)
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not a datatype or dataset")
diff --git a/src/H5trace.c b/src/H5trace.c
index cf14565..89685ad 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -1364,10 +1364,6 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
HDfprintf(out, "%ld (err stack)", (long)obj);
break;
- case H5I_SPACE_SEL_ITER:
- HDfprintf(out, "%ld (dataspace selection iterator)", (long)obj);
- break;
-
case H5I_NTYPES:
HDfprintf(out, "%ld (ntypes - error)", (long)obj);
break;
@@ -1549,10 +1545,6 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
HDfprintf(out, "H5I_ERROR_STACK");
break;
- case H5I_SPACE_SEL_ITER:
- HDfprintf(out, "H5I_SPACE_SEL_ITER");
- break;
-
case H5I_NTYPES:
HDfprintf(out, "H5I_NTYPES");
break;
diff --git a/test/links.c b/test/links.c
index 8011cca..6c92d2d 100644
--- a/test/links.c
+++ b/test/links.c
@@ -7305,7 +7305,6 @@ done:
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
return FAIL;
@@ -7394,7 +7393,6 @@ done:
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
return FAIL;
diff --git a/test/tfile.c b/test/tfile.c
index 7c4587c..b85b380 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -1445,7 +1445,6 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
- case H5I_SPACE_SEL_ITER:
case H5I_NTYPES:
default:
ERROR("H5Fget_obj_ids");