diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-02-19 19:30:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-02-19 19:30:26 (GMT) |
| commit | 8bc0ed5a5a53c4bbb19e46b9985a775b034ee6d2 (patch) | |
| tree | 90f3158854a89c0b426d4458ecec594dc6607a99 | |
| parent | 97ab252c0cbcc7ab124e94998cf4eb9ffeaaaf8d (diff) | |
| download | hdf5-8bc0ed5a5a53c4bbb19e46b9985a775b034ee6d2.zip hdf5-8bc0ed5a5a53c4bbb19e46b9985a775b034ee6d2.tar.gz hdf5-8bc0ed5a5a53c4bbb19e46b9985a775b034ee6d2.tar.bz2 | |
[svn-r21960] Fix unsigned long long format string in xml code.
Re-enable xml tests
Tested: 32-bits
| -rw-r--r-- | tools/h5dump/h5dump_xml.c | 8 | ||||
| -rwxr-xr-x | tools/h5dump/testh5dumpxml.sh.in | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c index cc16463..f21be3b 100644 --- a/tools/h5dump/h5dump_xml.c +++ b/tools/h5dump/h5dump_xml.c @@ -1680,7 +1680,7 @@ xml_dump_dataspace(hid_t space) /* Render the element */ h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "<%sDimension DimSize=\"%lu\" MaxDimSize=\"UNLIMITED\"/>", + h5tools_str_append(&buffer, "<%sDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" MaxDimSize=\"UNLIMITED\"/>", xmlnsprefix,size[i]); h5tools_render_element(stdout, outputformat, &ctx, &buffer, &curr_pos, outputformat->line_ncols, 0, 0); } @@ -1690,7 +1690,7 @@ xml_dump_dataspace(hid_t space) /* Render the element */ h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "<%sDimension DimSize=\"%lu\" MaxDimSize=\"%lu\"/>", + h5tools_str_append(&buffer, "<%sDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" MaxDimSize=\"%" H5_PRINTF_LL_WIDTH "u\"/>", xmlnsprefix,size[i], size[i]); h5tools_render_element(stdout, outputformat, &ctx, &buffer, &curr_pos, outputformat->line_ncols, 0, 0); } @@ -1700,7 +1700,7 @@ xml_dump_dataspace(hid_t space) /* Render the element */ h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "<%sDimension DimSize=\"%lu\" MaxDimSize=\"%lu\"/>", + h5tools_str_append(&buffer, "<%sDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" MaxDimSize=\"%" H5_PRINTF_LL_WIDTH "u\"/>", xmlnsprefix, size[i], maxsize[i]); h5tools_render_element(stdout, outputformat, &ctx, &buffer, &curr_pos, outputformat->line_ncols, 0, 0); } @@ -3798,7 +3798,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t UNUSED * sset) /* Render the element */ h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "<%sChunkDimension DimSize=\"%lu\" />", xmlnsprefix, chsize[i]); + h5tools_str_append(&buffer, "<%sChunkDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" />", xmlnsprefix, chsize[i]); h5tools_render_element(stdout, outputformat, &ctx, &buffer, &curr_pos, outputformat->line_ncols, 0, 0); } diff --git a/tools/h5dump/testh5dumpxml.sh.in b/tools/h5dump/testh5dumpxml.sh.in index d43a1cb..1bbf232 100755 --- a/tools/h5dump/testh5dumpxml.sh.in +++ b/tools/h5dump/testh5dumpxml.sh.in @@ -18,7 +18,6 @@ TESTNAME=h5dumpxml EXIT_SUCCESS=0 EXIT_FAILURE=1 - exit $EXIT_SUCCESS H5_LONE_COLON="@H5_LONE_COLON@" |