summaryrefslogtreecommitdiffstats
path: root/tools/h5diff
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2003-05-22 22:41:27 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2003-05-22 22:41:27 (GMT)
commit6790a626c85bb22df7adf4d6aaad4b1e80ff0eb7 (patch)
treeb06c36b6c03a30c60e6576228c5a41f062a46ba2 /tools/h5diff
parent064be7e1f8a1e5eff3430063b0f40608cbf788c7 (diff)
downloadhdf5-6790a626c85bb22df7adf4d6aaad4b1e80ff0eb7.zip
hdf5-6790a626c85bb22df7adf4d6aaad4b1e80ff0eb7.tar.gz
hdf5-6790a626c85bb22df7adf4d6aaad4b1e80ff0eb7.tar.bz2
[svn-r6915]
Purpose: bug fix for Tru64 and test of the latest szip library. Description: h5diff uses basename function that also is defined in the system string.h file. That caused compilation to fail. Solution: renamed basename to h5diff_basename Platforms tested: verbena, arabica, arabica-64, and PSC Compaq machine. Misc. update:
Diffstat (limited to 'tools/h5diff')
-rw-r--r--tools/h5diff/h5diff.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5diff/h5diff.c b/tools/h5diff/h5diff.c
index d61cf87..d399871 100644
--- a/tools/h5diff/h5diff.c
+++ b/tools/h5diff/h5diff.c
@@ -82,7 +82,7 @@ int check_f_input( const char* );
int get_index( const char *obj, int nobjects, info_t *info );
int compare_object( char *obj1, char *obj2 );
void usage(void);
-const char* basename(const char *name);
+const char* h5diff_basename(const char *name);
const char* get_type(int type);
const char* get_class(H5T_class_t tclass);
void print_dims( int r, hsize_t *d );
@@ -1142,8 +1142,8 @@ int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name,
*-------------------------------------------------------------------------
*/
printf( "Comparing <%s> with <%s>\n", obj1_name, obj2_name );
- name1=basename(obj1_name);
- name2=basename(obj2_name);
+ name1=h5diff_basename(obj1_name);
+ name2=h5diff_basename(obj2_name);
nfound = array_diff(buf1,buf2,tot_cnt1,rank1,dims1,options,name1,name2,m_type1);
printf("%d differences found\n", nfound );
@@ -2053,7 +2053,7 @@ void print_datatype(hid_t type)
/*-------------------------------------------------------------------------
- * Function: basename
+ * Function: h5diff_basename
*
* Purpose: Returns a pointer to the last component absolute name
*
@@ -2067,7 +2067,7 @@ void print_datatype(hid_t type)
*/
const char*
-basename(const char *name)
+h5diff_basename(const char *name)
{
size_t i;