diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-02-28 18:26:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-02-28 18:26:34 (GMT) |
| commit | df6c92e506a81ed0ede7dacc1269d21ae3e0f411 (patch) | |
| tree | c67a1ca1bb197289bd955ca4065f0c611dbcdf6e /tools/h5import | |
| parent | 9423da6a4d53cb2eb6c48a9e0d254307bbf8ae9b (diff) | |
| download | hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.zip hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.tar.gz hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.tar.bz2 | |
[svn-r22004] Reduced warnings and fixed conflicts resulting from including h5tools.h
Tested: local linux
Diffstat (limited to 'tools/h5import')
| -rwxr-xr-x | tools/h5import/h5import.c | 9 | ||||
| -rwxr-xr-x | tools/h5import/h5import.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index 89701bd..56dc5ab 100755 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -20,6 +20,7 @@ #include <string.h> #include <ctype.h> #include "h5import.h" +#include "h5tools.h" #include "h5tools_utils.h" /* Name of tool */ @@ -1361,7 +1362,7 @@ static int processConfigurationFile(char *infile, struct Input *in) break; case 12: /* EXTERNAL-STORAGE */ - if (in->configOptionVector[EXTERNAL] == 1) { + if (in->configOptionVector[EXTERNALSTORE] == 1) { (void) HDfprintf(stderr, err15a, infile); HDfclose(strm); return (-1); @@ -1372,7 +1373,7 @@ static int processConfigurationFile(char *infile, struct Input *in) HDfclose(strm); return (-1); } - in->configOptionVector[EXTERNAL] = 1; + in->configOptionVector[EXTERNALSTORE] = 1; break; case 13: /* MAXIMUM-DIMENSIONS */ @@ -1435,7 +1436,7 @@ static int validateConfigurationParameters(struct Input *in) return (-1); } - if (in->configOptionVector[EXTERNAL] == 1) { + if (in->configOptionVector[EXTERNALSTORE] == 1) { if ((in->configOptionVector[COMPRESS] == 1) || (in->configOptionVector[CHUNK] == 1) || (in->configOptionVector[EXTEND] == 1)) { (void) HDfprintf(stderr, "%s", err2); return (-1); @@ -2360,7 +2361,7 @@ static int process(struct Options *opt) H5Pset_deflate(proplist, (unsigned) in->compressionParam); } - if (in->configOptionVector[EXTERNAL] == 1) { + if (in->configOptionVector[EXTERNALSTORE] == 1) { /* creating the external file if it doesnt exist */ if ((extfile = HDfopen(in->externFilename, "ab")) == NULL) { (void) HDfprintf(stderr, "%s", err4); diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h index 05de476..dbc6844 100755 --- a/tools/h5import/h5import.h +++ b/tools/h5import/h5import.h @@ -47,7 +47,7 @@ #define CHUNK 0 #define COMPRESS 1 #define EXTEND 2 -#define EXTERNAL 3 +#define EXTERNALSTORE 3 #define DIM 4 #define RANK 5 #define PATH 6 |