diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-20 22:22:40 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-20 22:22:40 (GMT) |
| commit | 0b00c26b027b2d2afd3112d24573ceb767fc8376 (patch) | |
| tree | 6dfeabd5453da487c6e6473bd24c82895b4496b5 /test/tattr.c | |
| parent | 2d7c01d1eb8254c3b5d4977428edcf1c2523bd5e (diff) | |
| download | hdf5-0b00c26b027b2d2afd3112d24573ceb767fc8376.zip hdf5-0b00c26b027b2d2afd3112d24573ceb767fc8376.tar.gz hdf5-0b00c26b027b2d2afd3112d24573ceb767fc8376.tar.bz2 | |
[svn-r19274] Description:
Bring r19272 & 19273 from trunk to 1.8 branch:
Close out various resource leaks and usages of uninitialized memory that
were flagged by valgrind. [There's still some more valgrind warnings, but
it's better now... :-/ ]
Also clean up warnings and code formatting.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Mac OS X/32 10.6.4 (amazon) in debug mode
Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'test/tattr.c')
| -rw-r--r-- | test/tattr.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/test/tattr.c b/test/tattr.c index bec6743..baf30cc 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -9802,6 +9802,7 @@ test_attr_bug3(hid_t fcpl, hid_t fapl) dims2[2] = {3, 3}; /* Dimensions */ int wdata1[2][2]; unsigned wdata2[3][3]; /* Write buffers */ + unsigned u, v; /* Local index variables */ herr_t ret; /* Generic return status */ /* Output message about test being performed */ @@ -9849,11 +9850,18 @@ test_attr_bug3(hid_t fcpl, hid_t fapl) aid2 = H5Aopen(did, "attr", H5P_DEFAULT); CHECK(aid2, FAIL, "H5Aopen"); - /* Write data to the attributes (the data is uninitialized, we only care - * that H5Awrite succeeds for now) */ - ret = H5Awrite(aid1, H5T_NATIVE_INT, wdata1[0]); + /* Initialize the write buffers */ + for(u = 0; u < dims1[0]; u++) + for(v = 0; v < dims1[1]; v++) + wdata1[u][v] = (int)((u * dims1[1]) + v); + for(u = 0; u < dims2[0]; u++) + for(v = 0; v < dims2[1]; v++) + wdata2[u][v] = (int)((u * dims2[1]) + v); + + /* Write data to the attributes */ + ret = H5Awrite(aid1, H5T_NATIVE_INT, wdata1); CHECK(ret, FAIL, "H5Awrite"); - ret = H5Awrite(aid2, H5T_NATIVE_UINT, wdata2[0]); + ret = H5Awrite(aid2, H5T_NATIVE_UINT, wdata2); CHECK(ret, FAIL, "H5Awrite"); /* Close attributes */ |