[svn-r6007] Purpose:

Improvement
Description:
    Moved the code parsing for missing file name in the parse_command_line
    routine.
    Added a test checking if the tool fails as expected when no file name is
    given.
Platforms tested:
    Tested h5committest {arabica (fortran), eirene (fortran, C++)
	modi4 (parallel, fortran)}? YES
Misc. update:
    Update MANIFEST if you add or remove any file. YES, added nofilename.ddl
This commit is contained in:
Albert Cheng 2002-10-16 00:31:00 -05:00
parent 7e105d1066
commit 3ec37aad96
2 changed files with 10 additions and 10 deletions

View File

@ -2420,11 +2420,6 @@ parse_command_line(int argc, const char *argv[])
struct handler_t *hand, *last_dset = NULL;
int i, opt, last_was_dset = FALSE;
if (argc < 2) {
usage(progname);
exit(EXIT_FAILURE);
}
/* this will be plenty big enough to hold the info */
hand = calloc((size_t)argc, sizeof(struct handler_t));
@ -2612,6 +2607,12 @@ end_collect:
}
parse_end:
/* check for file name to be processed */
if (argc <= opt_ind) {
error_msg(progname, "missing file name\n");
usage(progname);
exit(EXIT_FAILURE);
}
return hand;
}
@ -2694,11 +2695,6 @@ main(int argc, const char *argv[])
struct handler_t *hand;
int i;
if (argc < 2) {
usage(progname);
exit(EXIT_FAILURE);
}
dump_header_format = &standardformat;
dump_function_table = &ddl_function_table;

View File

@ -173,6 +173,10 @@ TOOLTEST tall-5s.ddl -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5
TOOLTEST tdset-3s.ddl -d "/dset1[1,1;;;]" tdset.h5
TOOLTEST tdset2-1s.ddl -d "/dset1[;3,2;4,4;1,4]" tdset2.h5
# test failure handling
# Missing file name
TOOLTEST nofilename.ddl
# test XML
TOOLTEST tall.h5.xml --xml tall.h5
TOOLTEST tattr.h5.xml --xml tattr.h5