diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-23 06:27:57 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-23 06:27:57 (GMT) |
commit | f97d63cb95fa2595e5137a7ac6e0d1282fb5118b (patch) | |
tree | 698d5f3e535b8f77e4ecfb2da9722ab0cb040386 /hl/src/H5LT.c | |
parent | 67be45610fd450909038afea54f79e6a91c458cf (diff) | |
download | hdf5-f97d63cb95fa2595e5137a7ac6e0d1282fb5118b.zip hdf5-f97d63cb95fa2595e5137a7ac6e0d1282fb5118b.tar.gz hdf5-f97d63cb95fa2595e5137a7ac6e0d1282fb5118b.tar.bz2 |
[svn-r24869] Description:
Clean up more compiler warnings, plus merge a few Coverity bug fixes from
the hdf5_1_8_coverity branch back to the trunk:
r20877:
Purpose: Fix coverity issue 1723
Description:
Modified test_generate in hl/test_image to close file "f" before exit, even if
an error occurs.
r20879:
Issue 63: change check of return of H5Tget_nmembers to <=0. No need to go
futher if call fails as well as empty.
r20881:
Coverity #659 in Run 46: I changed the Line 442 where it tries to check whether
FLAG_PRINTED is TRUE. But it had just been set to FALSE. I took out the
condition check in the print statement.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & Parallel
(too minor to require h5committest)
Diffstat (limited to 'hl/src/H5LT.c')
-rw-r--r-- | hl/src/H5LT.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index d175099..aabd828 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -26,7 +26,7 @@ #define INCREMENT 1024 #define TMP_LEN 256 #define MAX(a,b) (((a)>(b)) ? (a) : (b)) -int input_len; +size_t input_len; char *myinput; size_t indent = 0; @@ -2290,9 +2290,9 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt) size_t dst_size; /*destination value type size */ int i; - if((nmembs = H5Tget_nmembers(type))==0) + if((nmembs = H5Tget_nmembers(type))<=0) goto out; - assert(nmembs>0); + if((super = H5Tget_super(type)) < 0) goto out; |