From 6924dc64535c645372e9bdeaadf3a7b86e44901f Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Thu, 5 Jun 2003 09:51:14 -0500 Subject: [svn-r6969] Purpose: Code cleanup Description: Correct a couple of mistakes in error macros. Platforms tested: FreeBSD 4.8 (sleipnir) triple check not necesssary. --- src/H5Shyper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 0bf7791..0635f1e 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -3656,11 +3656,11 @@ H5S_hyper_intersect (H5S_t *space1, H5S_t *space2) /* Check that the space selections both have span trees */ if(space1->select.sel_info.hslab.span_lst==NULL || space2->select.sel_info.hslab.span_lst==NULL) - HGOTO_ERROR(H5E_DATASPACE, H5E_ARGS, FAIL, "dataspace does not have span tree"); + HGOTO_ERROR(H5E_DATASPACE, H5E_UNINITIALIZED, FAIL, "dataspace does not have span tree"); /* Check that the dataspaces are both the same rank */ if(space1->extent.u.simple.rank!=space2->extent.u.simple.rank) - HGOTO_ERROR(H5E_DATASPACE, H5E_ARGS, FAIL, "dataspace ranks don't match"); + HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "dataspace ranks don't match"); /* Perform the span-by-span intersection check */ if((ret_value=H5S_hyper_intersect_helper(space1->select.sel_info.hslab.span_lst,space2->select.sel_info.hslab.span_lst))<0) @@ -5372,7 +5372,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op, /* Allocate a span info node */ if((spans = H5FL_MALLOC(H5S_hyper_span_info_t))==NULL) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate hyperslab span"); + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab span"); /* Set the reference count */ spans->count=1; -- cgit v0.12