diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5diff/h5diff.c | 3 | ||||
| -rw-r--r-- | tools/h5dump/h5dumpgentest.c | 6 | ||||
| -rwxr-xr-x | tools/h5import/h5importtest.c | 15 | ||||
| -rw-r--r-- | tools/lib/h5tools.c | 1 |
4 files changed, 11 insertions, 14 deletions
diff --git a/tools/h5diff/h5diff.c b/tools/h5diff/h5diff.c index da6c649..1d2e55d 100644 --- a/tools/h5diff/h5diff.c +++ b/tools/h5diff/h5diff.c @@ -856,7 +856,6 @@ int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name, hid_t space2_id =-1; hid_t f_type1=-1, f_type2=-1; /* file data type */ hid_t m_type1=-1, m_type2=-1; /* memory data type */ - size_t f_size1, f_size2; /* size of type in file */ size_t m_size1, m_size2; /* size of type in memory */ H5T_sign_t sign1, sign2; /* sign of type */ int rank1, rank2; @@ -1094,8 +1093,6 @@ int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name, m_type1 = fixtype( f_type1 ); m_type2 = fixtype( f_type2 ); - f_size1 = H5Tget_size( f_type1 ); - f_size2 = H5Tget_size( f_type2 ); m_size1 = H5Tget_size( m_type1 ); m_size2 = H5Tget_size( m_type2 ); diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 857d4e4..b2715a1 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -3868,6 +3868,7 @@ static void gent_attr_all(void) space_id = H5Screate_simple(1,dims,NULL); dset_id = H5Dcreate(file_id,"dset",H5T_NATIVE_INT,space_id,H5P_DEFAULT); status = H5Sclose(space_id); + assert(status>=0); /* Create groups */ group_id = H5Gcreate(file_id,"g1",0); @@ -3892,12 +3893,17 @@ static void gent_attr_all(void) /* Close */ status = H5Dclose(dset_id); + assert(status>=0); status = H5Gclose(group_id); + assert(status>=0); status = H5Gclose(group2_id); + assert(status>=0); status = H5Gclose(root_id); + assert(status>=0); /* Close file */ status = H5Fclose(file_id); + assert(status>=0); } diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c index c1a406c..48670c5 100755 --- a/tools/h5import/h5importtest.c +++ b/tools/h5import/h5importtest.c @@ -33,12 +33,12 @@ main(void) int i, j, k; FILE *sp; - float b32r2[3][4], b32r3[5][3][4]; + float b32r3[5][3][4]; float row4[3], col4[4], pln4[5]; float rowo4 = (float)11.0e0, colo4 = (float)21.0e0, plno4 = (float)51.0e0; float rowi4 = (float)1.0e0, coli4 = (float)2.0e0, plni4 = (float)5.0e0; - int b32i2[3][4], b32i3[5][3][4]; + int b32i3[5][3][4]; int row4i[3], col4i[4], pln4i[5]; int rowo4i = (int)11 , colo4i = (int)21 , plno4i = (int)51 ; int rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ; @@ -50,17 +50,17 @@ main(void) long_long rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ; #endif - short b16i2[3][4], b16i3[5][3][4]; + short b16i3[5][3][4]; short row4i16[3], col4i16[4], pln4i16[5]; short rowo4i16 = (short)11 , colo4i16 = (short)21 , plno4i16 = (short)51 ; short rowi4i16 = (short)1 , coli4i16 = (short)2 , plni4i16 = (short)5 ; - char b8i2[3][4], b8i3[5][3][4]; + char b8i3[5][3][4]; char row4i8[3], col4i8[4], pln4i8[5]; char rowo4i8 = (char)11 , colo4i8 = (char)21 , plno4i8 = (char)51 ; char rowi4i8 = (char)1 , coli4i8 = (char)2 , plni4i8 = (char)5 ; - double b64r2[3][4], b64r3[5][3][4]; + double b64r3[5][3][4]; double row8[3], col8[4], pln8[5]; double rowo8 = 11.0e0, colo8 = 21.0e0, plno8 = 51.0e0; double rowi8 = 1.0e0, coli8 = 2.0e0, plni8 = 5.0e0; @@ -146,14 +146,9 @@ main(void) { for (j = 0; j < ncol; j++) { - b32r2[i][j] = row4[i] + col4[j]; - b64r2[i][j] = row8[i] + col8[j]; - b32i2[i][j] = row4i[i] + col4i[j]; #ifndef WIN32 b64i2[i][j] = row4i64[i] + col4i64[j]; #endif - b16i2[i][j] = row4i16[i] + col4i16[j]; - b8i2[i][j] = row4i8[i] + col4i8[j]; } } diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 4200c50..58a663b 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -472,7 +472,6 @@ h5tools_dump_simple_data(FILE *stream, const h5dump_t *info, hid_t container, *this var to count elements and *break after we see a number equal *to the ctx->size_last_dim. */ - unsigned char *tmp=NULL; /* Setup */ memset(&buffer, 0, sizeof(h5tools_str_t)); |