mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r13033]

Browse Source 
avoid usage to call exit(1), it makes processes to stop in parallel.
This commit is contained in:
Pedro Vicente Nunes 2006-12-07 16:53:58 -05:00
parent 801aba05c0
commit 8f5f04bff2
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/h5diff/h5diff_common.c
View File

@ -45,12 +45,12 @@ void parse_input(int argc,
*/
if ( argc==2 && (strcmp("-h",argv[1])==0) )
usage(1);
usage();
if ( argc<3 )
{
printf("Number of arguments is only %d\n", argc );
usage(1);
usage();
}
/*-------------------------------------------------------------------------
@ -76,10 +76,10 @@ void parse_input(int argc,
switch (*s) {
default:
printf("-%s is an invalid option\n", s );
usage(1);
usage();
break;
case 'h':
usage(0);
usage();
break;
case 'v':
options->m_verbose = 1;
@ -99,7 +99,7 @@ void parse_input(int argc,
if ( check_f_input(argv[i+1])==-1)
{
printf("<-d %s> is not a valid option\n", argv[i+1] );
usage(1);
usage();
}
options->delta = atof(argv[i+1]);
i++; /* go to next */
@ -107,7 +107,7 @@ void parse_input(int argc,
else
{
printf("Not a valid -d option\n");
usage(1);
usage();
}
break;
case 'p':
@ -117,7 +117,7 @@ void parse_input(int argc,
if ( check_f_input(argv[i+1])==-1)
{
printf("<-p %s> is not a valid option\n", argv[i+1] );
usage(1);
usage();
}
options->percent = atof(argv[i+1]);
i++; /* go to next */
@ -125,7 +125,7 @@ void parse_input(int argc,
else
{
printf("Not a valid -p option\n");
usage(1);
usage();
}
break;
case 'n':
@ -135,7 +135,7 @@ void parse_input(int argc,
if ( check_n_input(argv[i+1])==-1)
{
printf("<-n %s> is not a valid option\n", argv[i+1] );
usage(1);
usage();
}
options->count = atol(argv[i+1]);
i++; /* go to next */
@ -143,7 +143,7 @@ void parse_input(int argc,
else
{
printf("Not a valid -n option\n");
usage(1);
usage();
}
break;
} /*switch*/
@ -288,7 +288,7 @@ int check_f_input( const char *str )
*
*-------------------------------------------------------------------------
*/
void usage(int status)
void usage(void)
{
printf("usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] \n");
printf("\n");
@ -343,7 +343,12 @@ void usage(int status)
printf("1) datasets: numerical array differences 2) groups: name string difference ");
printf("3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value\n");
h5diff_exit(status);
#ifdef H5_HAVE_PARALLEL
if(g_Parallel)
h5diff_exit(0);
else
#endif
exit(0);
}
/*-------------------------------------------------------------------------

2
tools/h5diff/h5diff_common.h
View File

@ -15,7 +15,7 @@
extern unsigned char g_Parallel;
extern int g_nTasks;
void usage(int status);
void usage(void);
int check_n_input( const char* );
int check_f_input( const char* );
void parse_input(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* options);