[svn-r14144] Description:

	Move H5Gget_objinfo() to deprecated symbols section and retarget
internal usage to H5Lget_info()/H5Oget_info().

	Misc. other code cleanups...

Tested on:
	FreeBSD/32 6.2 (duty)
	FreeBSD/64 6.2 (liberty)
	Linux/32 2.6 (kagiso)
	Linux/64 2.6 (smirom)
	AIX/32 5.3 (copper)
	Solaris/32 2.10 (linew)
	Mac OS X/32 10.4.10 (amazon)

1 files changed, 125 insertions, 127 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 50bc6cd..44154cd 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -128,12 +128,12 @@ void
 h5tools_close(void)
 {
     if (h5tools_init_g) {
-    if (rawdatastream && rawdatastream != stdout) {
-        if (fclose(rawdatastream))
-        perror("closing rawdatastream");
-        else
-        rawdatastream = NULL;
-    }
+        if (rawdatastream && rawdatastream != stdout) {
+            if (fclose(rawdatastream))
+            perror("closing rawdatastream");
+            else
+            rawdatastream = NULL;
+        }
 
         /* Clean up the reference path table, if it's been used */
         term_ref_path_table();
@@ -141,7 +141,7 @@ h5tools_close(void)
         /* Shut down the library */
         H5close();
 
-    h5tools_init_g = 0;
+        h5tools_init_g = 0;
     }
 }
 
@@ -554,152 +554,150 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
                                           *to the ctx->size_last_dim.   */
 
      /* binary dump */
-    if (bin_output)
-    {
-     do_bin_output(stream,nelmts,type,_mem);
-     bin_output=0;
-    }
-    else
-    {
-     /* Setup */
-     memset(&buffer, 0, sizeof(h5tools_str_t));
-     size = H5Tget_size(type);
+    if(bin_output) {
+        do_bin_output(stream, nelmts, type, _mem);
+        bin_output = 0;
+    } /* end if */
+    else {
+        /* Setup */
+        HDmemset(&buffer, 0, sizeof(h5tools_str_t));
+        size = H5Tget_size(type);
 
-     if (info->line_ncols > 0)
-      ncols = info->line_ncols;
+        if(info->line_ncols > 0)
+            ncols = info->line_ncols;
 
 
-    /* pass to the prefix in h5tools_simple_prefix the total position
-      instead of the current stripmine position i; this is necessary
-      to print the array indices */
-     curr_pos = ctx->sm_pos;
+        /* pass to the prefix in h5tools_simple_prefix the total position
+         * instead of the current stripmine position i; this is necessary
+         * to print the array indices
+         */
+        curr_pos = ctx->sm_pos;
 
-     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-     for (i = 0; i < nelmts; i++, ctx->cur_elmt++, elmt_counter++) {
-        /* Render the element */
-        h5tools_str_reset(&buffer);
-        h5tools_str_sprint(&buffer, info, container, type, mem + i * size, ctx);
+        for (i = 0; i < nelmts; i++, ctx->cur_elmt++, elmt_counter++) {
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_sprint(&buffer, info, container, type, mem + i * size, ctx);
 
-        if (i + 1 < nelmts || (flags & END_OF_DATA) == 0)
-            h5tools_str_append(&buffer, "%s", OPT(info->elmt_suf1, ","));
+            if (i + 1 < nelmts || (flags & END_OF_DATA) == 0)
+                h5tools_str_append(&buffer, "%s", OPT(info->elmt_suf1, ","));
 
-        s = h5tools_str_fmt(&buffer, 0, "%s");
+            s = h5tools_str_fmt(&buffer, 0, "%s");
 
-        /*
-         * If the element would split on multiple lines if printed at our
-         * current location...
-         */
-        if (info->line_multi_new == 1 &&
-                (ctx->cur_column + h5tools_ncols(s) +
-                 strlen(OPT(info->elmt_suf2, " ")) +
-                 strlen(OPT(info->line_suf, ""))) > ncols) {
-            if (ctx->prev_multiline) {
-                /*
-                 * ... and the previous element also occupied more than one
-                 * line, then start this element at the beginning of a line.
-                 */
-                ctx->need_prefix = TRUE;
-            } else if ((ctx->prev_prefix_len + h5tools_ncols(s) +
-                    strlen(OPT(info->elmt_suf2, " ")) +
-                    strlen(OPT(info->line_suf, ""))) <= ncols) {
-                /*
-                 * ...but *could* fit on one line otherwise, then we
-                 * should end the current line and start this element on its
-                 * own line.
-                 */
-                ctx->need_prefix = TRUE;
+            /*
+             * If the element would split on multiple lines if printed at our
+             * current location...
+             */
+            if (info->line_multi_new == 1 &&
+                    (ctx->cur_column + h5tools_ncols(s) +
+                     strlen(OPT(info->elmt_suf2, " ")) +
+                     strlen(OPT(info->line_suf, ""))) > ncols) {
+                if (ctx->prev_multiline) {
+                    /*
+                     * ... and the previous element also occupied more than one
+                     * line, then start this element at the beginning of a line.
+                     */
+                    ctx->need_prefix = TRUE;
+                } else if ((ctx->prev_prefix_len + h5tools_ncols(s) +
+                        strlen(OPT(info->elmt_suf2, " ")) +
+                        strlen(OPT(info->line_suf, ""))) <= ncols) {
+                    /*
+                     * ...but *could* fit on one line otherwise, then we
+                     * should end the current line and start this element on its
+                     * own line.
+                     */
+                    ctx->need_prefix = TRUE;
+                }
             }
-        }
 
-        /*
-         * We need to break after each row of a dimension---> we should
-         * break at the end of the each last dimension well that is the
-         * way the dumper did it before
-         */
-        if (info->arr_linebreak && ctx->cur_elmt) {
-            if (ctx->size_last_dim && (ctx->cur_elmt % ctx->size_last_dim) == 0)
-                ctx->need_prefix = TRUE;
+            /*
+             * We need to break after each row of a dimension---> we should
+             * break at the end of the each last dimension well that is the
+             * way the dumper did it before
+             */
+            if (info->arr_linebreak && ctx->cur_elmt) {
+                if (ctx->size_last_dim && (ctx->cur_elmt % ctx->size_last_dim) == 0)
+                    ctx->need_prefix = TRUE;
 
-            if ((hsize_t)elmt_counter == ctx->size_last_dim) {
-                ctx->need_prefix = TRUE;
-                elmt_counter = 0;
+                if ((hsize_t)elmt_counter == ctx->size_last_dim) {
+                    ctx->need_prefix = TRUE;
+                    elmt_counter = 0;
+                }
             }
-        }
-
-        /*
-         * If the previous element occupied multiple lines and this element
-         * is too long to fit on a line then start this element at the
-         * beginning of the line.
-         */
-        if (info->line_multi_new == 1 && ctx->prev_multiline &&
-                (ctx->cur_column + h5tools_ncols(s) +
-                 strlen(OPT(info->elmt_suf2, " ")) +
-                 strlen(OPT(info->line_suf, ""))) > ncols)
-            ctx->need_prefix = TRUE;
-
-        /*
-         * If too many elements have already been printed then we need to
-         * start a new line.
-         */
-        if (info->line_per_line > 0 && ctx->cur_elmt >= info->line_per_line)
-            ctx->need_prefix = TRUE;
 
-        /*
-         * Each OPTIONAL_LINE_BREAK embedded in the rendered string can cause
-         * the data to split across multiple lines.  We display the sections
-         * one-at a time.
-         */
-        for (secnum = 0, multiline = 0;
-                 (section = strtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK));
-                 secnum++) {
             /*
-             * If the current section plus possible suffix and end-of-line
-             * information would cause the output to wrap then we need to
-             * start a new line.
+             * If the previous element occupied multiple lines and this element
+             * is too long to fit on a line then start this element at the
+             * beginning of the line.
              */
+            if (info->line_multi_new == 1 && ctx->prev_multiline &&
+                    (ctx->cur_column + h5tools_ncols(s) +
+                     strlen(OPT(info->elmt_suf2, " ")) +
+                     strlen(OPT(info->line_suf, ""))) > ncols)
+                ctx->need_prefix = TRUE;
 
             /*
-             * Added the info->skip_first because the dumper does not want
-             * this check to happen for the first line
+             * If too many elements have already been printed then we need to
+             * start a new line.
              */
-            if ((!info->skip_first || i) &&
-                    (ctx->cur_column + strlen(section) +
-                     strlen(OPT(info->elmt_suf2, " ")) +
-                     strlen(OPT(info->line_suf, ""))) > ncols)
-                ctx->need_prefix = 1;
+            if (info->line_per_line > 0 && ctx->cur_elmt >= info->line_per_line)
+                ctx->need_prefix = TRUE;
 
             /*
-             * Print the prefix or separate the beginning of this element
-             * from the previous element.
+             * Each OPTIONAL_LINE_BREAK embedded in the rendered string can cause
+             * the data to split across multiple lines.  We display the sections
+             * one-at a time.
              */
-            if (ctx->need_prefix) {
-                if (secnum)
-                    multiline++;
-
-                  /* pass to the prefix in h5tools_simple_prefix the total position
-       instead of the current stripmine position i; this is necessary
-       to print the array indices */
-                curr_pos = ctx->sm_pos + i;
-
-                h5tools_simple_prefix(stream, info, ctx, curr_pos, secnum);
-            } else if ((i || ctx->continuation) && secnum == 0) {
-                fputs(OPT(info->elmt_suf2, " "), stream);
-                ctx->cur_column += strlen(OPT(info->elmt_suf2, " "));
-            }
+            for (secnum = 0, multiline = 0;
+                     (section = strtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK));
+                     secnum++) {
+                /*
+                 * If the current section plus possible suffix and end-of-line
+                 * information would cause the output to wrap then we need to
+                 * start a new line.
+                 */
 
-            /* Print the section */
-            fputs(section, stream);
-            ctx->cur_column += strlen(section);
-        }
+                /*
+                 * Added the info->skip_first because the dumper does not want
+                 * this check to happen for the first line
+                 */
+                if ((!info->skip_first || i) &&
+                        (ctx->cur_column + strlen(section) +
+                         strlen(OPT(info->elmt_suf2, " ")) +
+                         strlen(OPT(info->line_suf, ""))) > ncols)
+                    ctx->need_prefix = 1;
 
-        ctx->prev_multiline = multiline;
-    }
+                /*
+                 * Print the prefix or separate the beginning of this element
+                 * from the previous element.
+                 */
+                if (ctx->need_prefix) {
+                    if (secnum)
+                        multiline++;
+
+                    /* pass to the prefix in h5tools_simple_prefix the total
+                     * position instead of the current stripmine position i;
+                     * this is necessary to print the array indices
+                     */
+                    curr_pos = ctx->sm_pos + i;
+
+                    h5tools_simple_prefix(stream, info, ctx, curr_pos, secnum);
+                } else if ((i || ctx->continuation) && secnum == 0) {
+                    fputs(OPT(info->elmt_suf2, " "), stream);
+                    ctx->cur_column += strlen(OPT(info->elmt_suf2, " "));
+                }
 
-    h5tools_str_close(&buffer);
+                /* Print the section */
+                fputs(section, stream);
+                ctx->cur_column += strlen(section);
+            }
 
- }/* else bin */
+            ctx->prev_multiline = multiline;
+        }
 
+        h5tools_str_close(&buffer);
+    }/* else bin */
 }