diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
commit | 42efc1c2b591e4cd45ec6cb3bdf32044343118d2 (patch) | |
tree | 0ab542871c32246199479e8933ff26286aaf629a /tools/h5import | |
parent | 3360c3af0c100ac4d3a2fe2865f34661da862ec5 (diff) | |
download | hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.zip hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.gz hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.bz2 |
[svn-r18451] Description:
Bring r18172:18446 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'tools/h5import')
-rwxr-xr-x | tools/h5import/h5import.c | 20 | ||||
-rwxr-xr-x | tools/h5import/h5import.h | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index e9e7dac..24428cb 100755 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -766,7 +766,7 @@ readFloatData(FILE **strm, struct Input *in) /* same as TEXTFP */ case 2: /*TEXTFPE */ - + for (i = 0; i < len; i++, fp32++) { if (fscanf(*strm, "%f", fp32) != 1) @@ -775,7 +775,7 @@ readFloatData(FILE **strm, struct Input *in) return (-1); } } - + fp32 = (H5DT_FLOAT32 *) in->data; break; @@ -815,7 +815,7 @@ readFloatData(FILE **strm, struct Input *in) /* same as TEXTFP */ case 2: /*TEXTFPE */ - + for (i = 0; i < len; i++, fp64++) { if (fscanf(*strm, "%lf", fp64) != 1) @@ -824,7 +824,7 @@ readFloatData(FILE **strm, struct Input *in) return (-1); } } - + fp64 = (H5DT_FLOAT64 *) in->data; break; @@ -1437,7 +1437,7 @@ processConfigurationFile(char *infile, struct Input *in, FILE **strm) if (in->configOptionVector[COMPRESS] == 0) in->compressionType = 0; - + break; case 12: /* EXTERNAL-STORAGE */ @@ -1587,16 +1587,16 @@ static int parsePathInfo(struct path_info *path, char *temp) { const char delimiter[] = "/"; - char *token; + char *token; int i=0; const char *err1 = "Path string larger than MAX_PATH_NAME_LENGTH.\n"; token = HDstrtok (temp, delimiter); - if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) + if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) { (void) fprintf(stderr, err1); return (-1); - } + } HDstrcpy(path->group[i++],token); @@ -1609,7 +1609,7 @@ parsePathInfo(struct path_info *path, char *temp) { (void) fprintf(stderr, err1); return (-1); - } + } HDstrcpy(path->group[i++],token); } path->count = i; @@ -1621,7 +1621,7 @@ parseDimensions(struct Input *in, char *strm) { const char delimiter[] = ","; char temp[255]; - char *token; + char *token; int i=0; const char *err1 = "Unable to allocate dynamic memory.\n"; diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h index cbc6bf2..9e4f6e8 100755 --- a/tools/h5import/h5import.h +++ b/tools/h5import/h5import.h @@ -38,7 +38,7 @@ #define ERR 20 /* invalid token */ #define MAX_GROUPS_IN_PATH 20 -#define MAX_PATH_NAME_LENGTH 255 +#define MAX_PATH_NAME_LENGTH 255 #define NUM_KEYS 14 #define MIN_NUM_DIMENSION 1 #define MAX_NUM_DIMENSION 32 |