Merge/port changes from develop back to 1.8 for tools and cmake

4 files changed, 68 insertions, 56 deletions

diff --git a/tools/misc/CMakeTests.cmake b/tools/misc/CMakeTests.cmake
index ee60bf8..9c38132 100644
--- a/tools/misc/CMakeTests.cmake
+++ b/tools/misc/CMakeTests.cmake
@@ -69,7 +69,7 @@
 ##############################################################################
 ##############################################################################
 
-  MACRO (ADD_H5_TEST resultfile resultcode resultoption)
+  macro (ADD_H5_TEST resultfile resultcode resultoption)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
           NAME H5MKGRP-${resultfile}-clear-objects
@@ -105,9 +105,9 @@
       )
       set_tests_properties (H5MKGRP-${resultfile}-h5ls PROPERTIES DEPENDS H5MKGRP-${resultfile})
     endif ()
-  ENDMACRO ()
+  endmacro ()
 
-  MACRO (ADD_H5_CMP resultfile resultcode)
+  macro (ADD_H5_CMP resultfile resultcode)
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5MKGRP_CMP-${resultfile} COMMAND $<TARGET_FILE:h5mkgrp> ${ARGN})
     else ()
@@ -131,7 +131,7 @@
       )
       set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects)
     endif ()
-  ENDMACRO ()
+  endmacro ()
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 9c9153a..e37bcb3 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -57,15 +57,15 @@
 /*-------------------------------------------------------------------------
  * Function:    get_H5B2_class
  *
- * Purpose:	Determine the v2 B-tree class from the buffer read in.
+ * Purpose:  Determine the v2 B-tree class from the buffer read in.
  *              B-trees are debugged through the B-tree subclass.  The subclass
  *              identifier is two bytes after the B-tree signature.
  *
- * Return:	Non-NULL on success/NULL on failure
+ * Return:  Non-NULL on success/NULL on failure
  *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Sep 11 2008
+ * Programmer:  Quincey Koziol
+ *    koziol@hdfgroup.org
+ *    Sep 11 2008
  *
  *-------------------------------------------------------------------------
  */
@@ -143,16 +143,18 @@ get_H5B2_class(const uint8_t *sig)
 int
 main(int argc, char *argv[])
 {
-    hid_t	fid, fapl, dxpl;
+    hid_t  fid, fapl, dxpl;
     H5F_t       *f;
     haddr_t     addr = 0, extra = 0, extra2 = 0, extra3 = 0, extra4 = 0;
     uint8_t     sig[H5F_SIGNATURE_LEN];
     size_t      u;
+    H5E_auto2_t func;
+    void 	*edata;
     herr_t      status = SUCCEED;
 
     if(argc == 1) {
-  		HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
-  		HDexit(1);
+  	HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
+  	HDexit(1);
     } /* end if */
 
     /* Initialize the library */
@@ -161,6 +163,10 @@ main(int argc, char *argv[])
         HDexit(1);
     } /* end if */
 
+    /* Disable error reporting */
+    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
     /*
      * Open the file and get the file descriptor.
      */
@@ -448,6 +454,8 @@ main(int argc, char *argv[])
     H5Pclose(fapl);
     H5Fclose(fid);
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     return 0;
 } /* main() */
 
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index 8dee706..4ec923a 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -328,9 +328,6 @@ main(int argc, const char *argv[])
         leave(EXIT_FAILURE);
     } /* end if */
 
-    /* Shut down h5tools lib */
-    h5tools_close();
-
     leave(EXIT_SUCCESS);
 } /* end main() */
 
diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c
index ffd52e8..e44c957 100644
--- a/tools/misc/h5repart.c
+++ b/tools/misc/h5repart.c
@@ -194,27 +194,25 @@ main (int argc, char *argv[])
     int		src, dst=-1;		/*source & destination files	*/
     int		need_seek=FALSE;	/*destination needs to seek?	*/
     int		need_write;		/*data needs to be written?	*/
-    /*struct stat	sb;			temporary file stat buffer	*/
-	/*struct _stati64 sb;*/
-	h5_stat_t sb;
+    h5_stat_t sb;                       /*temporary file stat buffer	*/
 
     int		verbose=FALSE;		/*display file names?		*/
 
-    const char	*src_gen_name;		/*general source name		*/
-    char	src_name[NAMELEN];	/*source member name		*/
+    const char	*src_gen_name;  /*general source name		*/
+    char	*src_name=NULL;	    /*source member name		*/
 
     int		src_is_family;		/*is source name a family name?	*/
     int		src_membno=0;		/*source member number		*/
 
-    const char	*dst_gen_name;		/*general destination name	*/
-    char	dst_name[NAMELEN];	/*destination member name	*/
+    const char	*dst_gen_name;	/*general destination name	*/
+    char	*dst_name=NULL;	    /*destination member name	*/
     int		dst_is_family;		/*is dst name a family name?	*/
     int		dst_membno=0;		/*destination member number	*/
 
     off_t	left_overs=0;		/*amount of zeros left over	*/
     off_t	src_offset=0;		/*offset in source member	*/
     off_t	dst_offset=0;		/*offset in destination member	*/
-    off_t	src_size;		/*source logical member size	*/
+    off_t	src_size;           /*source logical member size	*/
     off_t	src_act_size;		/*source actual member size	*/
     off_t	dst_size=1 GB;		/*destination logical memb size	*/
     hid_t       fapl;                   /*file access property list     */
@@ -232,24 +230,30 @@ main (int argc, char *argv[])
      * Parse switches.
      */
     while (argno<argc && '-'==argv[argno][0]) {
-	if (!strcmp (argv[argno], "-v")) {
-	    verbose = TRUE;
-	    argno++;
-	} else if (!strcmp(argv[argno], "-V")) {
-	    printf("This is %s version %u.%u release %u\n",
-		   prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
-	    exit(EXIT_SUCCESS);
+        if (!strcmp (argv[argno], "-v")) {
+            verbose = TRUE;
+            argno++;
+        } else if (!strcmp(argv[argno], "-V")) {
+            printf("This is %s version %u.%u release %u\n",
+                prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
+            exit(EXIT_SUCCESS);
         } else if (!strcmp (argv[argno], "-family_to_sec2")) {
-	    family_to_sec2 = TRUE;
-	    argno++;
-	} else if ('b'==argv[argno][1]) {
-	    blk_size = get_size (prog_name, &argno, argc, argv);
-	} else if ('m'==argv[argno][1]) {
-	    dst_size = get_size (prog_name, &argno, argc, argv);
-	} else {
-	    usage (prog_name);
-	}
-    }
+            family_to_sec2 = TRUE;
+            argno++;
+        } else if ('b'==argv[argno][1]) {
+            blk_size = (size_t)get_size (prog_name, &argno, argc, argv);
+        } else if ('m'==argv[argno][1]) {
+            dst_size = get_size (prog_name, &argno, argc, argv);
+        } else {
+            usage (prog_name);
+        } /* end if */
+    } /* end while */
+
+    /* allocate names */
+    if(NULL == (src_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
+        exit(EXIT_FAILURE);
+    if(NULL == (dst_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
+        exit(EXIT_FAILURE);
 
     /*
      * Get the name for the source file and open the first member.  The size
@@ -261,13 +265,13 @@ main (int argc, char *argv[])
     src_is_family = strcmp (src_name, src_gen_name);
 
     if ((src=HDopen(src_name, O_RDONLY,0))<0) {
-	perror (src_name);
-	exit (EXIT_FAILURE);
+        perror (src_name);
+        exit (EXIT_FAILURE);
     }
 
     if (HDfstat(src, &sb)<0) {
-	perror ("fstat");
-	exit (EXIT_FAILURE);
+        perror ("fstat");
+        exit (EXIT_FAILURE);
     }
     src_size = src_act_size = sb.st_size;
     if (verbose) fprintf (stderr, "< %s\n", src_name);
@@ -290,7 +294,7 @@ main (int argc, char *argv[])
     if (argno<argc) usage (prog_name);
 
     /* Now the real work, split the file */
-    buf = HDmalloc (blk_size);
+    buf = (char *)HDmalloc(blk_size);
     while (src_offset<src_size) {
 
 	/* Read a block.  The amount to read is the minimum of:
@@ -302,7 +306,7 @@ main (int argc, char *argv[])
 	if (dst_is_family) n = (size_t)MIN((off_t)n, dst_size-dst_offset);
 	if (left_overs) {
 	    n = (size_t)MIN ((off_t)n, left_overs);
-	    left_overs -= n;
+	    left_overs = left_overs - (off_t)n;
 	    need_write = FALSE;
 	} else if (src_offset<src_act_size) {
 	    n = (size_t)MIN ((off_t)n, src_act_size-src_offset);
@@ -353,16 +357,16 @@ main (int argc, char *argv[])
 	 * loop.   The destination offset must be updated so we can fix
 	 * trailing holes.
 	 */
-	src_offset += n;
+	src_offset = src_offset + (off_t)n;
 	if (src_offset==src_act_size) {
 	    HDclose (src);
 	    if (!src_is_family) {
-		dst_offset += n;
+                dst_offset = dst_offset + (off_t)n;
 		break;
 	    }
 	    sprintf (src_name, src_gen_name, ++src_membno);
 	    if ((src=HDopen (src_name, O_RDONLY,0))<0 && ENOENT==errno) {
-		dst_offset += n;
+                dst_offset = dst_offset + (off_t)n;
 		break;
 	    } else if (src<0) {
 		perror (src_name);
@@ -386,7 +390,7 @@ main (int argc, char *argv[])
 	 * needed. The first member is extended to the logical member size
 	 * but other members might be smaller if they end with a hole.
 	 */
-	dst_offset += n;
+        dst_offset = dst_offset + (off_t)n;
 	if (dst_is_family && dst_offset==dst_size) {
 	    if (0==dst_membno) {
 		if (HDlseek (dst, dst_size-1, SEEK_SET)<0) {
@@ -468,7 +472,7 @@ main (int argc, char *argv[])
         }
 
         /* Set the property of the new member size as hsize_t */
-        hdsize = dst_size;
+        hdsize = (hsize_t)dst_size;
         if(H5Pset(fapl, H5F_ACS_FAMILY_NEWSIZE_NAME, &hdsize) < 0) {
             perror ("H5Pset");
             exit (EXIT_FAILURE);
@@ -485,19 +489,22 @@ main (int argc, char *argv[])
     H5E_BEGIN_TRY {
         file=H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl);
     } H5E_END_TRY;
+
     if(file>=0) {
         if(H5Fclose(file)<0) {
             perror ("H5Fclose");
             exit (EXIT_FAILURE);
-        }
-    }
+        } /* end if */
+    } /* end if */
 
     if(H5Pclose(fapl)<0) {
         perror ("H5Pclose");
         exit (EXIT_FAILURE);
-    }
+    } /* end if */
 
     /* Free resources and return */
-    HDfree (buf);
+    HDfree(src_name);
+    HDfree(dst_name);
+    HDfree(buf);
     return EXIT_SUCCESS;
-}
+} /* end main */