[svn-r24810] Description:

    Bring r24803 & r24804 from trunk to 1.8 branch:

r24804:
   Brought changes from Coverity branch back to trunk, and cleaned up misc.
   other warnings & formatting issues:

   r20833:
   Fixed Coverity 667 and 668 with real integer overflow tests this time.

   r20834:
   Use HDstrncpy and HDstrncat. --gh 

   r20835:
   Change to use strncpy - use base_len + 1 for line 156, use HDstrlen(path) + 1 for line 159

   r20836:
   Fixed coverity 585 by casting output of fgetc() to a char.

   r20837:
   Changed sprintf calls to snprintf with size 1 less than the allocated buffer to address coverity issue #967.

r24803:
  Rename GCC_DIAG_OFF/ON macros to H5_GCC_DIAG_OFF/ON and move from
  src/H5private.h to src/H5public.h.  Wrap typedef of hsize_t and hssize_t
  in DIAG_OFF(long-long) macros.

  Clean up a bunch of "macro '-' is unused" warnings.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
    (too minor to require h5committest)

1 files changed, 10 insertions, 13 deletions

diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index 0169d71..b4f87af 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -24,9 +24,6 @@
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-#define TRUE 1
-#define FALSE 0
-
 /* Name of tool */
 #define PROGRAMNAME "tellub"
 
@@ -85,21 +82,21 @@ usage (const char *prog)
 static void
 parse_command_line (int argc, const char *argv[])
 {
-  int opt = FALSE;
+  int opt;
 
   /* parse command line options */
   while ((opt = get_option (argc, argv, s_opts, l_opts)) != EOF)
     {
       switch ((char) opt)
-  {
-  case 'h':
-    usage (h5tools_getprogname());
-    exit (EXIT_SUCCESS);
-  case '?':
-  default:
-    usage (h5tools_getprogname());
-    exit (EXIT_FAILURE);
-  }
+      {
+      case 'h':
+        usage (h5tools_getprogname());
+        exit (EXIT_SUCCESS);
+      case '?':
+      default:
+        usage (h5tools_getprogname());
+        exit (EXIT_FAILURE);
+      }
     }
 
   /* check for file name to be processed */