diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-08-09 01:02:02 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-08-09 01:02:02 (GMT) |
| commit | 4e6b652c3d0fdd94fc7f2aa588ab63cea7bcde64 (patch) | |
| tree | 067a2194a69b6f5334310528b1650c131971c861 /tools/misc | |
| parent | 98ac51ba1c4b73081ab0a3091f3cca703426b593 (diff) | |
| download | hdf5-4e6b652c3d0fdd94fc7f2aa588ab63cea7bcde64.zip hdf5-4e6b652c3d0fdd94fc7f2aa588ab63cea7bcde64.tar.gz hdf5-4e6b652c3d0fdd94fc7f2aa588ab63cea7bcde64.tar.bz2 | |
[svn-r22647] Description:
Bring r22646 from trunk to 1.8 branch:
Changes resulting from Klocwork static analysis tool, from Mark Miller
@ LLNL (miller86@llnl.gov).
Tested on:
Mac OS X/64 10.7.4 (amazon) w/debug, C++ & FORTRAN, using gcc 4.7.x
(too minor to require h5committest)
Diffstat (limited to 'tools/misc')
| -rw-r--r-- | tools/misc/talign.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/misc/talign.c b/tools/misc/talign.c index 88ebaa6..b77d846 100644 --- a/tools/misc/talign.c +++ b/tools/misc/talign.c @@ -148,28 +148,31 @@ out: result = 1; mname = H5Tget_member_name(fix, 0); printf("%14s (%2d) %6s = %s\n", - mname, (int)H5Tget_member_offset(fix,0), + mname ? mname : "(null)", (int)H5Tget_member_offset(fix,0), string5, (char *)(data + H5Tget_member_offset(fix, 0))); - free(mname); + if(mname) + free(mname); fptr = (float *)(data + H5Tget_member_offset(fix, 1)); mname = H5Tget_member_name(fix, 1); printf("Data comparison:\n" "%14s (%2d) %6f = %f\n" " %6f = %f\n", - mname, (int)H5Tget_member_offset(fix,1), + mname ? mname : "(null)", (int)H5Tget_member_offset(fix,1), fok[0], fptr[0], fok[1], fptr[1]); - free(mname); + if(mname) + free(mname); fptr = (float *)(data + H5Tget_member_offset(fix, 2)); mname = H5Tget_member_name(fix, 2); printf("%14s (%2d) %6f = %f\n" " %6f = %6f\n", - mname, (int)H5Tget_member_offset(fix,2), + mname ? mname : "(null)", (int)H5Tget_member_offset(fix,2), fnok[0], fptr[0], fnok[1], fptr[1]); - free(mname); + if(mname) + free(mname); fptr = (float *)(data + H5Tget_member_offset(fix, 1)); printf("\n" |