diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
---|---|---|
committer | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
commit | adb2fd1cc0858602046959689377dbdb60a4c3a6 (patch) | |
tree | 3d2ea72ca7ba9c2502d9c2230d261acd9fe7c95d /tools/h5jam/h5jam.c | |
parent | 9f69967286c1014355421b02db986303de1cfcda (diff) | |
parent | ebc0b44fe18a40b7f31bdde45ec9f16edd4f658a (diff) | |
download | hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.zip hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.gz hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.bz2 |
[svn-r24208] Merge revisions through r24202 from trunk to vol branch
Tested: jam, koala, ostrich, platypus (h5committest)
There are failures on platypus (cmake) that were present previously
Diffstat (limited to 'tools/h5jam/h5jam.c')
-rw-r--r-- | tools/h5jam/h5jam.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index 014ff0b..19c0a41 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -327,7 +327,7 @@ main (int argc, const char *argv[]) leave (EXIT_FAILURE); } - h5fsize = sbuf2.st_size; + h5fsize = (hsize_t)sbuf2.st_size; if (output_file == NULL) { ofid = HDopen (input_file, O_WRONLY, 0); @@ -385,16 +385,19 @@ main (int argc, const char *argv[]) /* pad the ub */ where = write_pad (ofid, where); - if (ub_file) + if(ub_file) HDfree (ub_file); - if (input_file) + if(input_file) HDfree (input_file); - if (output_file) + if(output_file) HDfree (output_file); - if (ufid >= 0) HDclose (ufid); - if (h5fid >= 0) HDclose (h5fid); - if (ofid >= 0) HDclose (ofid); + if(ufid >= 0) + HDclose (ufid); + if(h5fid >= 0) + HDclose (h5fid); + if(ofid >= 0) + HDclose (ofid); return h5tools_getstatus(); } |