summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-02-20 17:41:00 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-02-20 17:41:00 (GMT)
commit1d0c7360efe514761da8f424a75a80a1c9f1dcf8 (patch)
tree2c76b2e57f285fe82f5aaa191f8bd2c34075ca2b
parente808e596aba7a400a7ce9c4fba2a03a82da43d59 (diff)
downloadhdf5-1d0c7360efe514761da8f424a75a80a1c9f1dcf8.zip
hdf5-1d0c7360efe514761da8f424a75a80a1c9f1dcf8.tar.gz
hdf5-1d0c7360efe514761da8f424a75a80a1c9f1dcf8.tar.bz2
[svn-r21963] Fixed issue with compression value not printing - format parameter was wrong, needed to be long long.
Enabled compression tests Tested: 32-bit windows
-rw-r--r--tools/h5dump/testh5dump.sh.in40
-rw-r--r--tools/lib/h5tools_dump.c16
2 files changed, 28 insertions, 28 deletions
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index dcb9cbb..ee91880 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -885,18 +885,18 @@ TOOLTEST texceedsubblock.ddl -d 1d -k 1,3 taindices.h5
# tests for filters
# SZIP
option="-H -p -d szip tfilters.h5"
-#if test $USE_FILTER_SZIP != "yes"; then
+if test $USE_FILTER_SZIP != "yes"; then
SKIP $option
-#else
-#TOOLTEST tszip.ddl $option
-#fi
+else
+TOOLTEST tszip.ddl $option
+fi
# deflate
option="-H -p -d deflate tfilters.h5"
-#if test $USE_FILTER_DEFLATE != "yes"; then
+if test $USE_FILTER_DEFLATE != "yes"; then
SKIP $option
-#else
-# TOOLTEST tdeflate.ddl $option
-#fi
+else
+ TOOLTEST tdeflate.ddl $option
+fi
# shuffle
option="-H -p -d shuffle tfilters.h5"
if test $USE_FILTER_SHUFFLE != "yes"; then
@@ -913,25 +913,25 @@ else
fi
# nbit
option="-H -p -d nbit tfilters.h5"
-#if test $USE_FILTER_NBIT != "yes"; then
+if test $USE_FILTER_NBIT != "yes"; then
SKIP $option
-#else
-# TOOLTEST tnbit.ddl $option
-#fi
+else
+ TOOLTEST tnbit.ddl $option
+fi
# scaleoffset
option="-H -p -d scaleoffset tfilters.h5"
-#if test $USE_FILTER_SCALEOFFSET != "yes"; then
+if test $USE_FILTER_SCALEOFFSET != "yes"; then
SKIP $option
-#else
-# TOOLTEST tscaleoffset.ddl $option
-#fi
+else
+ TOOLTEST tscaleoffset.ddl $option
+fi
# all
option="-H -p -d all tfilters.h5"
-#if test $USE_FILTER_FLETCHER32 != "yes" -o $USE_FILTER_SZIP != "yes" -o $USE_FILTER_DEFLATE != "yes" -o $USE_FILTER_SHUFFLE != "yes" -o $USE_FILTER_NBIT != "yes" -o $USE_FILTER_SCALEOFFSET != "yes"; then
+if test $USE_FILTER_FLETCHER32 != "yes" -o $USE_FILTER_SZIP != "yes" -o $USE_FILTER_DEFLATE != "yes" -o $USE_FILTER_SHUFFLE != "yes" -o $USE_FILTER_NBIT != "yes" -o $USE_FILTER_SCALEOFFSET != "yes"; then
SKIP $option
-#else
-# TOOLTEST tallfilters.ddl $option
-#fi
+else
+ TOOLTEST tallfilters.ddl $option
+fi
# user defined
TOOLTEST tuserfilter.ddl --enable-error-stack -H -p -d myfilter tfilters.h5
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 2e194be..7a83fc7 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2889,9 +2889,9 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
h5tools_str_append(&buffer, "%s ", CHUNKED);
rank = H5Pget_chunk(dcpl_id,NELMTS(chsize),chsize);
- h5tools_str_append(&buffer, "%s %u", h5tools_dump_header_format->dataspacedimbegin, chsize[0]);
+ h5tools_str_append(&buffer, "%s %" H5_PRINTF_LL_WIDTH "u", h5tools_dump_header_format->dataspacedimbegin, chsize[0]);
for(i = 1; i < rank; i++)
- h5tools_str_append(&buffer, ", %u", chsize[i]);
+ h5tools_str_append(&buffer, ", %" H5_PRINTF_LL_WIDTH "u", chsize[i]);
h5tools_str_append(&buffer, " %s", h5tools_dump_header_format->dataspacedimend);
h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0);
@@ -2941,18 +2941,18 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
if(storage_size != 0)
ratio = (double) uncomp_size / (double) storage_size;
- h5tools_str_append(&buffer, "SIZE %u (%.3f:1 COMPRESSION)", storage_size, ratio);
+ h5tools_str_append(&buffer, "SIZE %" H5_PRINTF_LL_WIDTH "u (%.3f:1 COMPRESSION)", storage_size, ratio);
}
else
- h5tools_str_append(&buffer, "SIZE %u", storage_size);
+ h5tools_str_append(&buffer, "SIZE %" H5_PRINTF_LL_WIDTH "u", storage_size);
H5Sclose(sid);
H5Tclose(tid);
}
else {
- h5tools_str_append(&buffer, "SIZE %u", storage_size);
+ h5tools_str_append(&buffer, "SIZE %" H5_PRINTF_LL_WIDTH "u", storage_size);
}
h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0);
@@ -2979,7 +2979,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
h5tools_str_reset(&buffer);
- h5tools_str_append(&buffer, "SIZE %u", storage_size);
+ h5tools_str_append(&buffer, "SIZE %" H5_PRINTF_LL_WIDTH "u", storage_size);
h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0);
ctx->indent_level--;
@@ -3025,7 +3025,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
h5tools_str_reset(&buffer);
- h5tools_str_append(&buffer, "FILENAME %s SIZE %u OFFSET %ld", name, size, offset);
+ h5tools_str_append(&buffer, "FILENAME %s SIZE %" H5_PRINTF_LL_WIDTH "u OFFSET %ld", name, size, offset);
h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0);
}
ctx->indent_level--;
@@ -3060,7 +3060,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
h5tools_str_reset(&buffer);
- h5tools_str_append(&buffer,"SIZE %u", storage_size);
+ h5tools_str_append(&buffer,"SIZE %" H5_PRINTF_LL_WIDTH "u", storage_size);
h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0);
ctx->need_prefix = TRUE;