[svn-r145] ./src/H5Osdtyp.c -> H5Odtype.c

./src/H5Osdim.c		-> H5Osdspace.c
./src/Makefile.in
	Changed the names of these files to better reflect what they
	actually do.

./src/H5.c
./src/H5AC.c
./src/H5B.c
./src/H5C.c
./src/H5D.c
./src/H5E.c
./src/H5Eprivate.h
./src/H5Epublic.h
./src/H5F.c
./src/H5Fcore.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5Gshad.c
./src/H5Gstab.c
./src/H5H.c
./src/H5M.c
./src/H5MF.c
./src/H5O.c
./src/H5Osdtyp.c (./src/H5Odtype.c)
./src/H5P.c
./src/H5T.c
./src/H5detect.c
./src/H5private.h
	Added an argument to the HRETURN_ERROR(), HGOTO_ERROR(), and
	HERROR() macros which is a string error message.  This allows
	us to give extra information which can't be represented by the
	major and minor error numbers.  This information was
	previously in comments just before or after the macro call.
	The string isn't currently used, but I'm planning to change
	the test files so they print an error trace when something
	fails.  This should make debugging a little faster since it's
	often obvious what's wrong if we could just see the error
	stack without even having to start a debugger.

1 files changed, 31 insertions, 26 deletions

diff --git a/src/H5M.c b/src/H5M.c
index d1911bd..31a5bd4 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -229,11 +229,12 @@ hid_t H5Maccess(hid_t oid)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].access==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
+		    "no access method");
     ret_value=(meta_func_arr[i].access)(oid);
 
 done:
@@ -272,11 +273,11 @@ hid_t H5Mcopy(hid_t oid)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].copy==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no copy method");
     ret_value=(meta_func_arr[i].copy)(oid);
 
 done:
@@ -326,12 +327,12 @@ H5Mfind_name (hid_t owner_id, group_t type, const char *name)
     i=H5M_find_type(group);
 #else /* OLD_WAY */
     if(type<=BADGROUP || type>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(type);
 #endif /* OLD_WAY */
     if(meta_func_arr[i].find_name==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no open method");
     ret_value=(meta_func_arr[i].find_name)(owner_id,type,name);
 
 done:
@@ -370,11 +371,11 @@ uint32 H5Mname_len(hid_t oid)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].name_len==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no name_len method");
     ret_value=(meta_func_arr[i].name_len)(oid);
 
 done:
@@ -414,11 +415,12 @@ herr_t H5Mget_name(hid_t oid, char *name)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].get_name==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
+		    "no get_name method");
     ret_value=(meta_func_arr[i].get_name)(oid,name);
 
 done:
@@ -458,11 +460,12 @@ herr_t H5Mset_name(hid_t oid, const char *name)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].set_name==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
+		    "no set_name method");
     ret_value=(meta_func_arr[i].set_name)(oid,name);
 
 done:
@@ -504,11 +507,11 @@ H5Msearch (hid_t oid, group_t type, const char *name)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].search==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no search method");
     ret_value=(meta_func_arr[i].search)(oid,type,name);
 
 done:
@@ -550,11 +553,11 @@ H5Mindex (hid_t oid, group_t type, uint32 idx)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL,  "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].index==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no index method");
     ret_value=(meta_func_arr[i].index)(oid,type,idx);
 
 done:
@@ -594,12 +597,12 @@ hid_t H5Mflush(hid_t oid)
     H5ECLEAR;
     group=H5Aatom_group(oid);	/* look up group for incoming object */
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     /* Find correct function pointer set from static array */
     i=H5M_find_type(group);
     if(meta_func_arr[i].flush==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no flush method");
     ret_value=(meta_func_arr[i].flush)(oid);
 
 done:
@@ -639,11 +642,11 @@ herr_t H5Mdelete(hid_t oid)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].delete==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no delete method");
     ret_value=(meta_func_arr[i].delete)(oid);
 
 done:
@@ -682,11 +685,12 @@ hid_t H5Mget_parent(hid_t oid)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].get_parent==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
+		    "no get_parent method");
     ret_value=(meta_func_arr[i].get_parent)(oid);
 
 done:
@@ -725,11 +729,12 @@ hid_t H5Mget_file(hid_t oid)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].get_file==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
+		    "no get_file method");
     ret_value=(meta_func_arr[i].get_file)(oid);
 
 done:
@@ -768,11 +773,11 @@ herr_t H5Mclose(hid_t oid)
     /* Clear errors and check args and all the boring stuff. */
     H5ECLEAR;
     if(group<=BADGROUP || group>=MAXGROUP)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL);
+	HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "bad group");
 
     i=H5M_find_type(group);
     if(meta_func_arr[i].close==NULL)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL);
+	HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "no close method");
     ret_value=(meta_func_arr[i].close)(oid);
 
 done: