diff options
| -rw-r--r-- | src/H5Z.c | 29 | ||||
| -rw-r--r-- | test/dsets.c | 5 |
2 files changed, 10 insertions, 24 deletions
@@ -1252,42 +1252,33 @@ done: * Programmer: James Laird and Nat Furrer * Monday, June 7, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ -herr_t H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags) +herr_t +H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags) { - herr_t ret_value=SUCCEED; - H5Z_class_t * fclass; + H5Z_class_t *fclass; + herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Zget_filter_info, FAIL) - fclass = H5Z_find(filter); - -#ifdef H5_WANT_H5_V1_6_COMPAT - if(fclass == NULL && filter_config_flags != NULL) { - *filter_config_flags = 0; - HGOTO_DONE(SUCCEED) - } /* end if */ -#else - if(fclass == NULL) + /* Look up the filter class info */ + if(NULL == (fclass = H5Z_find(filter))) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Filter not defined") -#endif /* H5_WANT_H5_V1_6_COMPAT */ - if(filter_config_flags != NULL) - { + /* Set the filter config flags for the application */ + if(filter_config_flags != NULL) { *filter_config_flags = 0; if(fclass->encoder_present) *filter_config_flags |= H5Z_FILTER_CONFIG_ENCODE_ENABLED; if(fclass->decoder_present) *filter_config_flags |= H5Z_FILTER_CONFIG_DECODE_ENABLED; - } + } /* end if */ done: FUNC_LEAVE_API(ret_value) -} +} /* end H5Zget_filter_info() */ /*------------------------------------------------------------------------- diff --git a/test/dsets.c b/test/dsets.c index ccfb6ca..0f3b330 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -1822,15 +1822,10 @@ test_get_filter_info(void) /* Verify that get_filter_info throws an error when given a bad filter */ /* (Depends on 1.6 compatibility flag) */ -#ifdef H5_WANT_H5_V1_6_COMPAT - if(H5Zget_filter_info(-1, &flags) < 0) TEST_ERROR - if(flags != 0) TEST_ERROR -#else /* H5_WANT_H5_V1_6_COMPAT */ H5E_BEGIN_TRY { err = H5Zget_filter_info(-1, &flags); } H5E_END_TRY; if(err >= 0) TEST_ERROR -#endif /* H5_WANT_H5_V1_6_COMPAT */ PASSED(); return 0; |