summaryrefslogtreecommitdiffstats
path: root/tools/h5import/h5import.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-02-28 18:26:34 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-02-28 18:26:34 (GMT)
commitdf6c92e506a81ed0ede7dacc1269d21ae3e0f411 (patch)
treec67a1ca1bb197289bd955ca4065f0c611dbcdf6e /tools/h5import/h5import.c
parent9423da6a4d53cb2eb6c48a9e0d254307bbf8ae9b (diff)
downloadhdf5-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/h5import.c')
-rwxr-xr-xtools/h5import/h5import.c9
1 files changed, 5 insertions, 4 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);