diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2001-12-13 16:43:24 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2001-12-13 16:43:24 (GMT) |
| commit | 4b7fe911263077521c00f7c2e3a8d651152fdef2 (patch) | |
| tree | 2c1360e87fb9bf99559f7b902817edc38615f993 /tools/h4toh5 | |
| parent | faf5c098401f7a9a10ed24c64fcac7d83cb56476 (diff) | |
| download | hdf5-4b7fe911263077521c00f7c2e3a8d651152fdef2.zip hdf5-4b7fe911263077521c00f7c2e3a8d651152fdef2.tar.gz hdf5-4b7fe911263077521c00f7c2e3a8d651152fdef2.tar.bz2 | |
[svn-r4719]
Purpose:
minor code changes for SDS conversion with unlimited dimension case
Description:
Solution:
Platforms tested:
eirene
Diffstat (limited to 'tools/h4toh5')
| -rw-r--r-- | tools/h4toh5/h4toh5main.h | 1 | ||||
| -rw-r--r-- | tools/h4toh5/h4toh5sds.c | 10 | ||||
| -rw-r--r-- | tools/h4toh5/h4toh5util.h | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/tools/h4toh5/h4toh5main.h b/tools/h4toh5/h4toh5main.h index 1898c19..2802caa 100644 --- a/tools/h4toh5/h4toh5main.h +++ b/tools/h4toh5/h4toh5main.h @@ -37,7 +37,6 @@ Author: Kent Yang(ymuqun@ncsa.uiuc.edu) #include "h4toh5util.h" #include <fcntl.h> #include <errno.h> -#include "h4toh5user.h" #endif /* For windows support.*/ diff --git a/tools/h4toh5/h4toh5sds.c b/tools/h4toh5/h4toh5sds.c index 548429b..01b7e8f 100644 --- a/tools/h4toh5/h4toh5sds.c +++ b/tools/h4toh5/h4toh5sds.c @@ -125,9 +125,9 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int int memopt; int sdsopt_flag = 1; - memopt = 0; + memopt = 0; + slabsize = 0; if((fp= fopen("parafile","r"))==NULL){/*ignore the parameter file */ - printf("coming here\n"); sdsopt_flag = 0; memopt = 0; chunksize = HDF4_CHUNKSIZE; @@ -141,10 +141,6 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int fscanf(fp,"%d",&chunksize); fclose(fp); } - /* if(memsize <=0) slabsize = -1;*/ - if(memopt == 1) - slabsize = SLABSIZE*1000000; - else slabsize = 0; special_code = -1; /* zeroing out the memory for sdsname and sdslabel.*/ @@ -490,7 +486,7 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int return FAIL; } - if(count_sdsdata*h4memsize <= slabsize || MEMOPT!= 1) { + if(count_sdsdata*h4memsize <= slabsize || memopt!= 1) { sds_data = malloc(h4memsize*count_sdsdata); diff --git a/tools/h4toh5/h4toh5util.h b/tools/h4toh5/h4toh5util.h index ea13319..3143687 100644 --- a/tools/h4toh5/h4toh5util.h +++ b/tools/h4toh5/h4toh5util.h @@ -151,7 +151,7 @@ public constant for hdf lib, this constant can be released.*/ /*13. define a default first dimension chunking size when the current unlimited dimensional size of SDS is set to 0. */ -#define DEF_CHUNKSIZE 20 +#define HDF4_CHUNKSIZE 20 extern int32 estnum_vg; extern int32 estnum_vd; extern int32 num_sds; |