diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-03 17:40:11 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-03 17:40:11 (GMT) |
commit | 523a4f7658cc3af131a4a10f8030fc7387745702 (patch) | |
tree | 4758f745b1942d4ef8fc653c79ac0255196ca7ca /test | |
parent | db447ec89ab9968af637941a146129f437ba8b98 (diff) | |
download | hdf5-523a4f7658cc3af131a4a10f8030fc7387745702.zip hdf5-523a4f7658cc3af131a4a10f8030fc7387745702.tar.gz hdf5-523a4f7658cc3af131a4a10f8030fc7387745702.tar.bz2 |
[svn-r26717] Merge revisions 26387, 26649, 26650, 26678, and 26691 from trunk to squish warnings.
Diffstat (limited to 'test')
-rw-r--r-- | test/ttsafe_cancel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c index 56f431e..d8ed462 100644 --- a/test/ttsafe_cancel.c +++ b/test/ttsafe_cancel.c @@ -123,7 +123,7 @@ void tts_cancel(void) void *tts_cancel_thread(void UNUSED *arg) { int datavalue; - int *buffer; + int buffer; hid_t dataspace, datatype, dataset; hsize_t dimsf[1]; /* dataset dimensions */ cancel_cleanup_t *cleanup_structure; @@ -156,10 +156,9 @@ void *tts_cancel_thread(void UNUSED *arg) ret=H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue); assert(ret>=0); - buffer = HDmalloc(sizeof(int)); - ret=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); + ret=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &buffer); assert(ret>=0); - ret=H5Diterate(buffer, H5T_NATIVE_INT, dataspace, tts_cancel_callback, &dataset); + ret=H5Diterate(&buffer, H5T_NATIVE_INT, dataspace, tts_cancel_callback, &dataset); assert(ret>=0); sleep(3); |