[svn-r1347]

Changes since 19990614
----------------------

./src/H5D.c
	Changed the way the plist_id argument of H5Dvlen_reclaim() is
	checked so that it's more specific and works when debugging is
	turned off.

./src/H5TB.c
	Removed an unused local variable.

./test/fillval.c
./test/h5test.c
./test/h5test.h
	Changed `basename' variables to `base_name' to prevent a
	warning about a global with the same name.

./tools/h5ls.c
	Changed `indent' variables to `ind' to prevent a warning about
	a global with the same name.

./tools/h5toh4.c
	Commented out declarations for things that normally appear in
	system header files since our definitions might be
	incompatible with the system and prevent h5toh4 from
	compiling.  If all looks good on other systems then we can
	permanently remove these declarations...

1 files changed, 5 insertions, 5 deletions

diff --git a/test/h5test.c b/test/h5test.c
index 861b0f0..09b2f06 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -185,12 +185,12 @@ h5_reset(void)
  *-------------------------------------------------------------------------
  */
 char *
-h5_fixname(const char *basename, hid_t fapl, char *fullname, size_t size)
+h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
 {
     const char		*prefix=NULL, *suffix=NULL;
     H5F_driver_t	driver;
     
-    if (!basename || !fullname || size<1) return NULL;
+    if (!base_name || !fullname || size<1) return NULL;
 
     /* First use the environment variable, then try the constant */
     prefix = getenv("HDF5_PREFIX");
@@ -200,13 +200,13 @@ h5_fixname(const char *basename, hid_t fapl, char *fullname, size_t size)
 
     /* Prepend the prefix value to the base name */
     if (prefix && *prefix) {
-	if (HDsnprintf(fullname, size, "%s/%s", prefix, basename)==(int)size) {
+	if (HDsnprintf(fullname, size, "%s/%s", prefix, base_name)==(int)size) {
 	    return NULL; /*buffer is too small*/
 	}
-    } else if (strlen(basename)>=size) {
+    } else if (strlen(base_name)>=size) {
 	return NULL; /*buffer is too small*/
     } else {
-	strcpy(fullname, basename);
+	strcpy(fullname, base_name);
     }
 
     /* Append a suffix */