[svn-r16311] Description:
Bring revisions 16280:16307 back from trunk.
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
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 production 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
This commit is contained in:
@@ -31,7 +31,7 @@ const char *progname = "h5diff";
|
||||
* Command-line options: The user can specify short or long-named
|
||||
* parameters.
|
||||
*/
|
||||
static const char *s_opts = "hVrvqn:d:p:";
|
||||
static const char *s_opts = "hVrvqn:d:p:N";
|
||||
static struct long_options l_opts[] = {
|
||||
{ "help", no_arg, 'h' },
|
||||
{ "version", no_arg, 'V' },
|
||||
@@ -41,6 +41,7 @@ static struct long_options l_opts[] = {
|
||||
{ "count", require_arg, 'n' },
|
||||
{ "delta", require_arg, 'd' },
|
||||
{ "relative", require_arg, 'p' },
|
||||
{ "nan", no_arg, 'N' },
|
||||
{ NULL, 0, '\0' }
|
||||
};
|
||||
|
||||
@@ -70,6 +71,9 @@ void parse_command_line(int argc,
|
||||
/* assume equal contents initially */
|
||||
options->contents = 1;
|
||||
|
||||
/* NaNs are handled by default */
|
||||
options->do_nans = 1;
|
||||
|
||||
/* parse command line options */
|
||||
while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
|
||||
{
|
||||
@@ -130,6 +134,10 @@ void parse_command_line(int argc,
|
||||
options->count = atol( opt_arg );
|
||||
|
||||
break;
|
||||
|
||||
case 'N':
|
||||
options->do_nans = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -323,6 +331,7 @@ void usage(void)
|
||||
printf(" -r, --report Report mode. Print differences\n");
|
||||
printf(" -v, --verbose Verbose mode. Print differences, list of objects\n");
|
||||
printf(" -q, --quiet Quiet mode. Do not do output\n");
|
||||
printf(" -N, --nan Avoid NaNs detection\n");
|
||||
|
||||
printf(" -n C, --count=C Print differences up to C number\n");
|
||||
printf(" -d D, --delta=D Print difference when greater than limit D\n");
|
||||
|
||||
Reference in New Issue
Block a user