[svn-r84] Arg sizes fixes in tfile.c

Name change in th5d.c

3 files changed, 17 insertions, 13 deletions

diff --git a/test/tfile.c b/test/tfile.c
index 05b84fd..90a5883 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -120,12 +120,12 @@ static void test_file_create(void)
     ret=H5Csetparm(tmpl1,H5_USERBLOCK_SIZE,&parm);
     CHECK(ret,FAIL,"H5Csetparm");
 
-    parm=F2_OFFSET_SIZE;
-    ret=H5Csetparm(tmpl1,H5_OFFSET_SIZE,&parm);
+    parm2=F2_OFFSET_SIZE;
+    ret=H5Csetparm(tmpl1,H5_OFFSET_SIZE,&parm2);
     CHECK(ret,FAIL,"H5Csetparm");
 
-    parm=F2_LENGTH_SIZE;
-    ret=H5Csetparm(tmpl1,H5_LENGTH_SIZE,&parm);
+    parm2=F2_LENGTH_SIZE;
+    ret=H5Csetparm(tmpl1,H5_LENGTH_SIZE,&parm2);
     CHECK(ret,FAIL,"H5Csetparm");
 
     parm=F2_SYM_LEAF_K;
diff --git a/test/th5d.c b/test/th5d.c
index eb074dc..b977ce7 100644
--- a/test/th5d.c
+++ b/test/th5d.c
@@ -81,12 +81,10 @@ static void test_h5d_basic_write(void)
     hatom_t tid1;   /* Datatype ID */
     hatom_t sid1;   /* Dataspace ID */
     uint32 dims1[]={SPACE1_DIM1,SPACE1_DIM2,SPACE1_DIM3};   /* dataspace dim sizes */
-#ifdef DATASET2
     hatom_t did2;   /* Dataset ID */
     hatom_t tid2;   /* Datatype ID */
     hatom_t sid2;   /* Dataspace ID */
     uint32 dims2[]={SPACE2_DIM1,SPACE2_DIM2,SPACE2_DIM3,SPACE2_DIM4};   /* dataspace dim sizes */
-#endif /* DATASET2 */
     herr_t ret;         /* Generic return value */
 
     /* Output message about test being performed */
@@ -123,7 +121,6 @@ static void test_h5d_basic_write(void)
     ret=H5Mrelease(tid1);
     CHECK(ret,FAIL,"H5Mrelease");
     
-#ifdef DATASET2
     sid2=H5Mcreate(fid1,H5_DATASPACE,SPACE2_NAME);
     CHECK(sid1,FAIL,"H5Mcreate");
 
@@ -153,7 +150,6 @@ static void test_h5d_basic_write(void)
     
     ret=H5Mrelease(sid2);
     CHECK(ret,FAIL,"H5Mrelease");
-#endif /* DATASET2 */
     
     ret=H5Mrelease(sid1);
     CHECK(ret,FAIL,"H5Mrelease");
@@ -189,7 +185,7 @@ static void test_h5d_basic_read(void)
     fid1=H5Fopen(FILE,0,0);
     CHECK(fid1,FAIL,"H5Fopen");
 
-    oid1=H5Mfind_name(fid1,H5_DATASET,SPACE1_NAME);
+    oid1=H5Mfind_name(fid1,H5_DATASET,DATA1_NAME);
     CHECK(oid1,FAIL,"H5Mfind_name");
 
     did1=H5Maccess(oid1);
diff --git a/test/tmeta.c b/test/tmeta.c
index 64f6b75..014a09a 100644
--- a/test/tmeta.c
+++ b/test/tmeta.c
@@ -101,22 +101,30 @@ void test_metadata(void)
     /* Check the values decoded */
     if(di16!=TEST_INT16_VALUE)
       {
-        print_func("Error decoding int16 meta-data wanted: %d, got: %d\n",(int)TEST_INT16_VALUE,(int)di16);
+        print_func ("Error decoding int16 meta-data wanted: %d, got: %d "
+		    "at %s:%d\n", __FILE__, __LINE__, (int)TEST_INT16_VALUE,
+		    (int)di16);
         num_errs++;
       } /* end if */
     if(du16!=TEST_UINT16_VALUE)
       {
-        print_func("Error decoding uint16 meta-data wanted: %u, got: %u\n",(unsigned)TEST_UINT16_VALUE,(unsigned)du16);
+        print_func ("Error decoding uint16 meta-data wanted: %u, got: %u "
+		    "at %s:%d\n", __FILE__, __LINE__,
+		    (unsigned)TEST_UINT16_VALUE, (unsigned)du16);
         num_errs++;
       } /* end if */
     if(di32!=TEST_INT32_VALUE)
       {
-        print_func("Error decoding int32 meta-data wanted: %ld, got: %ld\n",(long)TEST_INT32_VALUE,(long)di32);
+        print_func ("Error decoding int32 meta-data wanted: %ld, got: %ld "
+		    "at %s:%d\n", __FILE__, __LINE__, (long)TEST_INT32_VALUE,
+		    (long)di32);
         num_errs++;
       } /* end if */
     if(du32!=TEST_UINT32_VALUE)
       {
-        print_func("Error decoding uint32 meta-data wanted: %lu, got: %lu\n",(unsigned long)TEST_UINT32_VALUE,(unsigned long)du32);
+        print_func ("Error decoding uint32 meta-data wanted: %lu, got: %lu "
+		    "at %s:%d\n", __FILE__, __LINE__,
+		    (unsigned long)TEST_UINT32_VALUE, (unsigned long)du32);
         num_errs++;
       } /* end if */
 }   /* test_metadata() */