[svn-r29534] Normalization w/ revise_chunks in preparation for big merge.

tools directory

Also fixes a minor Java test output error.

Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
           autotools serial w/ Java, Fortran, & C++

2 files changed, 4 insertions, 1 deletions

diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index d2e3ea6..cec3b9d 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -510,7 +510,7 @@ typedef struct h5tools_context_t {
     hsize_t size_last_dim;                   /*the size of the last dimension,
                                               *needed so we can break after each
                                               *row */
-    int  indent_level;                 /*the number of times we need some
+    int  indent_level;                /*the number of times we need some
                                        *extra indentation */
     int  default_indent_level;        /*this is used when the indent level gets changed */
     hsize_t acc[H5S_MAX_RANK];        /* accumulator position */
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index bdb82a4..13c6a20 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -267,6 +267,9 @@ h5tools_str_fmt(h5tools_str_t *str/*in,out*/, size_t start, const char *fmt)
 {
     char _temp[1024], *temp = _temp;
 
+    HDassert(str);
+    HDassert(fmt);
+
     /* If the format string is simply "%s" then don't bother doing anything */
     if (!HDstrcmp(fmt, "%s"))
         return str->s;