[svn-r16920] Description:

    Merge these trunk revisions which occurred during the 1.8.3 release code
freeze back to the 1.8 branch:

    From Quincey: 16845 16847 16849 16851 16858 16869 16897

    From Ray: 16859 16880

    From Allen: 16863

Tested on:
    FreeBSD/32 6.3 (duty) in debug mode
    FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
    Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
        in debug mode
    Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
        w/C++ & FORTRAN, in production mode
    Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
        w/szip filter, in production mode
    Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
        in production mode
    Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
    Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
    Mac OS X/32 10.5.6 (amazon) in debug mode
    Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
        in production mode

1 files changed, 2 insertions, 6 deletions

diff --git a/test/big.c b/test/big.c
index 8176929..dde9d7a 100644
--- a/test/big.c
+++ b/test/big.c
@@ -505,7 +505,6 @@ main (int ac, char **av)
     hid_t	fapl=-1;
     hsize_t	family_size;
     hsize_t	family_size_def;	/* default family file size */
-    double	family_size_def_dbl;	/* default family file size */
     unsigned long seed = 0;             /* Random # seed */
     int		cflag=1;		/* check file system before test */
     char	filename[1024];
@@ -518,11 +517,8 @@ main (int ac, char **av)
 	if (strcmp("-fsize", *av)==0){
 	    /* specify a different family file size */
 	    ac--; av++;
-	    if (ac > 0){
-		family_size_def_dbl = atof(*av);
-                H5_ASSIGN_OVERFLOW(family_size_def,family_size_def_dbl,double,hsize_t);
-		if (family_size_def <= 0)
-		    family_size_def = (hsize_t)FAMILY_SIZE;
+	    if (ac > 0) {
+		family_size_def = (hsize_t)HDstrtoull(*av, NULL, 0);
 	    }
 	    else{
 		printf("***Missing fsize value***\n");