mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r6949] Purpose:

Browse Source 
Minor corrections to match the man pages. Code provided by Pankaj.

Description:
  * do not accept more than 30 file names
  * corrected error messages.

Solution:

Platforms tested:
Tested on verbena.
Already tested on several platforms before integration.

Misc. update:
This commit is contained in:
Robert E. McGrath 2003-06-03 15:12:30 -05:00
parent 360fc65279
commit 112aff61ca
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/h5import/h5import.c
View File

@ -38,7 +38,8 @@ int main(int argc, char *argv[])
const char *err6 = "Invalid dimensions - %s.\n"; const char *err6 = "Invalid dimensions - %s.\n";
const char *err7 = "Invalid type of data - %s.\n"; const char *err7 = "Invalid type of data - %s.\n";
const char *err8 = "Invalid size of data - %s.\n"; const char *err8 = "Invalid size of data - %s.\n";
const char *err9 = "Cannot specify more than 30 input files in one call to h5import.\n";
(void) setvbuf(stderr, (char *) NULL, _IOLBF, 0); (void) setvbuf(stderr, (char *) NULL, _IOLBF, 0);
(void) setvbuf(stdout, (char *) NULL, _IOLBF, 0); (void) setvbuf(stdout, (char *) NULL, _IOLBF, 0);
@ -77,12 +78,19 @@ int main(int argc, char *argv[])
switch (state) switch (state)
{ {
case 1: /* counting input files */ case 1: /* counting input files */
(void) HDstrcpy(opt.infiles[opt.fcount].datafile, argv[i]); if (opt.fcount < 29) {
in = &(opt.infiles[opt.fcount].in); (void) HDstrcpy(opt.infiles[opt.fcount].datafile, argv[i]);
opt.infiles[opt.fcount].config = 0; in = &(opt.infiles[opt.fcount].in);
setDefaultValues(in, opt.fcount); opt.infiles[opt.fcount].config = 0;
opt.fcount++; setDefaultValues(in, opt.fcount);
opt.fcount++;
}
else {
(void) fprintf(stderr, err9, argv[i]);
goto err;
}
break; break;
case 2: /* -c found; look for configfile */ case 2: /* -c found; look for configfile */
@ -113,7 +121,7 @@ int main(int argc, char *argv[])
if (parseDimensions(in, argv[i]) == -1) if (parseDimensions(in, argv[i]) == -1)
{ {
(void) fprintf(stderr, err6, argv[i]); (void) fprintf(stderr, err6, argv[i]);
return (-1); goto err;
} }
break; break;
@ -124,7 +132,7 @@ int main(int argc, char *argv[])
if (parsePathInfo(&in->path, argv[i]) == -1) if (parsePathInfo(&in->path, argv[i]) == -1)
{ {
(void) fprintf(stderr, err5, argv[i]); (void) fprintf(stderr, err5, argv[i]);
return (-1); goto err;
} }
break; break;
@ -135,7 +143,7 @@ int main(int argc, char *argv[])
if (getInputClass(in, argv[i]) == -1) if (getInputClass(in, argv[i]) == -1)
{ {
(void) fprintf(stderr, err7, argv[i]); (void) fprintf(stderr, err7, argv[i]);
return (-1); goto err;
} }
if (in->inputClass == 0 || in->inputClass == 4) if (in->inputClass == 0 || in->inputClass == 4)
@ -153,7 +161,7 @@ int main(int argc, char *argv[])
if (getInputSize(in, HDstrtol(argv[i], NULL, BASE_10)) == -1) if (getInputSize(in, HDstrtol(argv[i], NULL, BASE_10)) == -1)
{ {
(void) fprintf(stderr, err8, argv[i]); (void) fprintf(stderr, err8, argv[i]);
return (-1); goto err;
} }
/*set default value for output-size */ /*set default value for output-size */
in->outputSize = in->inputSize; in->outputSize = in->inputSize;
@ -180,7 +188,7 @@ int main(int argc, char *argv[])
return(0); return(0);
err: err:
(void) fprintf(stderr, err4); (void) fprintf(stderr, err4);
return(1); return(-1);
} }
static int static int