summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/.distdep412
-rw-r--r--src/H5D.c20
-rw-r--r--src/H5Distore.c4
-rw-r--r--src/H5Fistore.c4
-rw-r--r--src/H5Omtime.c2
-rw-r--r--src/H5S.c1
-rw-r--r--src/H5Shyper.c8
-rw-r--r--src/H5Z.c6
8 files changed, 223 insertions, 234 deletions
diff --git a/src/.distdep b/src/.distdep
index b402f5a..2adfc73 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -50,34 +50,6 @@ H5Ffamily.o: \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h
-H5Fmpio.o: \
- H5Fmpio.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Dprivate.h \
- H5Dpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5MMprivate.h \
- H5MMpublic.h
H5Fsec2.o: \
H5Fsec2.c \
H5private.h \
@@ -331,29 +303,6 @@ H5Olayout.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
-H5Omtime.o: \
- H5Omtime.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h
H5Oname.o: \
H5Oname.c \
H5private.h \
@@ -613,29 +562,6 @@ H5O.o: \
H5Tprivate.h \
H5Tpublic.h \
H5Sprivate.h
-H5Ocomp.o: \
- H5Ocomp.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h
H5Oefl.o: \
H5Oefl.c \
H5private.h \
@@ -664,34 +590,6 @@ H5Oefl.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
-H5Sselect.o: \
- H5Sselect.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Iprivate.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Zprivate.h \
- H5Zpublic.h
H5P.o: \
H5P.c \
H5private.h \
@@ -720,19 +618,6 @@ H5P.o: \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h
-H5Flow.o: \
- H5Flow.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5MMprivate.h \
- H5MMpublic.h
H5A.o: \
H5A.c \
H5private.h \
@@ -766,39 +651,6 @@ H5A.o: \
H5Ppublic.h \
H5Apkg.h \
H5Aprivate.h
-H5F.o: \
- H5F.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Aprivate.h \
- H5Apublic.h \
- H5Ipublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Dprivate.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5Iprivate.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h
H5Tconv.o: \
H5Tconv.c \
H5Iprivate.h \
@@ -899,29 +751,6 @@ H5Sall.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h
-H5Shyper.o: \
- H5Shyper.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h
H5Spoint.o: \
H5Spoint.c \
H5private.h \
@@ -973,25 +802,22 @@ H5T.o: \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h
-H5Z.o: \
- H5Z.c \
+H5G.o: \
+ H5G.c \
H5private.h \
H5public.h \
H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
+ H5Ipublic.h \
H5Dpublic.h \
+ H5Dprivate.h \
H5Gprivate.h \
H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
@@ -999,17 +825,29 @@ H5Z.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h \
- H5Zpublic.h
-H5Fistore.o: \
- H5Fistore.c \
+ H5Zpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Gpkg.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h \
+ H5Iprivate.h \
+ H5MMprivate.h
+H5D.o: \
+ H5D.c \
H5private.h \
H5public.h \
H5config.h \
- H5Dprivate.h \
- H5Dpublic.h \
+ H5Iprivate.h \
H5Ipublic.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
H5Fprivate.h \
H5Fpublic.h \
+ H5Dpublic.h \
+ H5Dprivate.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
@@ -1026,21 +864,53 @@ H5Fistore.o: \
H5Zpublic.h \
H5Eprivate.h \
H5Epublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h \
H5MFprivate.h \
H5MFpublic.h
-H5D.o: \
- H5D.c \
+H5F.o: \
+ H5F.c \
H5private.h \
H5public.h \
H5config.h \
- H5Iprivate.h \
+ H5Aprivate.h \
+ H5Apublic.h \
H5Ipublic.h \
- H5ACprivate.h \
- H5ACpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
H5Dprivate.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Iprivate.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
+H5Fistore.o: \
+ H5Fistore.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Dprivate.h \
+ H5Dpublic.h \
+ H5Ipublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
@@ -1057,24 +927,37 @@ H5D.o: \
H5Zpublic.h \
H5Eprivate.h \
H5Epublic.h \
- H5HLprivate.h \
- H5HLpublic.h \
H5MFprivate.h \
H5MFpublic.h
-H5G.o: \
- H5G.c \
+H5Flow.o: \
+ H5Flow.c \
H5private.h \
H5public.h \
H5config.h \
- H5Bprivate.h \
- H5Bpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
H5Fprivate.h \
H5Fpublic.h \
- H5Ipublic.h \
H5Dpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
+H5Fmpio.o: \
+ H5Fmpio.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
H5Dprivate.h \
+ H5Dpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
H5Gprivate.h \
H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
@@ -1085,15 +968,31 @@ H5G.o: \
H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
+H5Omtime.o: \
+ H5Omtime.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
H5Eprivate.h \
H5Epublic.h \
- H5Gpkg.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5HLprivate.h \
- H5HLpublic.h \
- H5Iprivate.h \
- H5MMprivate.h
+ H5Ipublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h
H5S.o: \
H5S.c \
H5private.h \
@@ -1117,3 +1016,104 @@ H5S.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h
+H5Shyper.o: \
+ H5Shyper.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h
+H5Sselect.o: \
+ H5Sselect.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5Iprivate.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h
+H5Ocomp.o: \
+ H5Ocomp.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h
+H5Z.o: \
+ H5Z.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h
diff --git a/src/H5D.c b/src/H5D.c
index b96b900..e033e93 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1340,11 +1340,6 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"unable to convert from file to memory data space");
}
-<<<<<<< H5D.c
-#ifdef QAK
- printf("%s: check 1.0\n",FUNC);
-#endif /* QAK */
-
#ifdef HAVE_PARALLEL
/* rky 980813 This is a temporary KLUGE.
* The sconv functions should be set by H5S_find,
@@ -1353,12 +1348,9 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
* (the latter in case the arguments to sconv_funcs
* turn out to be inappropriate for MPI-IO). */
if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO) {
- sconv_func.read = H5S_mpio_spaces_read;
+ sconv->read = H5S_mpio_spaces_read;
}
#endif /*HAVE_PARALLEL*/
-
-=======
->>>>>>> 1.113
/*
* If there is no type conversion then try reading directly into the
@@ -1694,11 +1686,6 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"unable to convert from memory to file data space");
}
-<<<<<<< H5D.c
-#ifdef QAK
- printf("%s: check 1.0\n",FUNC);
-#endif /* QAK */
-
#ifdef HAVE_PARALLEL
/* rky 980813 This is a temporary KLUGE.
* The sconv functions should be set by H5S_find,
@@ -1707,13 +1694,10 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
* (the latter in case the arguments to sconv_funcs
* turn out to be inappropriate for MPI-IO). */
if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO) {
- sconv_func.write = H5S_mpio_spaces_write;
+ sconv->write = H5S_mpio_spaces_write;
}
#endif /*HAVE_PARALLEL*/
-=======
-
->>>>>>> 1.113
/*
* If there is no type conversion then try writing directly from
* application buffer to file.
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 3c858bd..dcea323 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -171,7 +171,7 @@ H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
intn i;
- intn ndims = (intn)((bt->sizeof_rkey-4)/4);
+ intn ndims = (intn)((bt->sizeof_rkey-8)/4);
FUNC_ENTER(H5F_istore_decode_key, FAIL);
@@ -213,7 +213,7 @@ static herr_t
H5F_istore_encode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
- intn ndims = (intn)((bt->sizeof_rkey-4) / 4);
+ intn ndims = (intn)((bt->sizeof_rkey-8) / 4);
intn i;
FUNC_ENTER(H5F_istore_encode_key, FAIL);
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 3c858bd..dcea323 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -171,7 +171,7 @@ H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
intn i;
- intn ndims = (intn)((bt->sizeof_rkey-4)/4);
+ intn ndims = (intn)((bt->sizeof_rkey-8)/4);
FUNC_ENTER(H5F_istore_decode_key, FAIL);
@@ -213,7 +213,7 @@ static herr_t
H5F_istore_encode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
- intn ndims = (intn)((bt->sizeof_rkey-4) / 4);
+ intn ndims = (intn)((bt->sizeof_rkey-8) / 4);
intn i;
FUNC_ENTER(H5F_istore_encode_key, FAIL);
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 5601550..0a6ebea 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -120,7 +120,7 @@ H5O_mtime_decode(H5F_t __unused__ *f, const uint8 *p,
HRETURN_ERROR(H5E_OHDR, H5E_CANTINIT, NULL,
"unable to obtain local timezone information");
}
- the_time -= tz.tz_minuteswest*60 - (tm.tm_idst?3600:0);
+ the_time -= tz.tz_minuteswest*60 - (tm.tm_isdst?3600:0);
}
#elif defined(HAVE_GETTIMEOFDAY) && defined(HAVE_STRUCT_TIMEZONE)
{
diff --git a/src/H5S.c b/src/H5S.c
index 3649e21..7fb1088 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -183,6 +183,7 @@ H5S_term_interface(void)
/* Clear/free conversion table */
HDmemset(H5S_fconv_g, 0, sizeof(H5S_fconv_g));
HDmemset(H5S_mconv_g, 0, sizeof(H5S_mconv_g));
+ for (i=0; i<H5S_nconv_g; i++) H5MM_xfree(H5S_conv_g[i]);
H5S_conv_g = H5MM_xfree(H5S_conv_g);
H5S_nconv_g = H5S_aconv_g = 0;
}
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 7797ad7..fcfb171 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -300,8 +300,9 @@ H5S_hyper_get_regions (size_t *num_regions, intn dim, size_t bound_count,
printf("%s: check 2.0.5, lo_bounds[%d][%d].bound=%d\n",FUNC,
(int)dim,(int)i,(int)lo_bounds[dim][i].bound);
#endif /* QAK */
- for(; pos[dim]>=(lo_bounds[dim][i].bound+offset[dim]) && i<bound_count; i++) {
-
+ for (/*void*/;
+ i<bound_count && pos[dim]>=lo_bounds[dim][i].bound+offset[dim];
+ i++) {
#ifdef QAK
printf("%s: check 2.1, i=%d, num_reg=%d, pos[%d]=%d\n",
FUNC,i,(int)num_reg,dim,(int)pos[dim]);
@@ -1875,7 +1876,8 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src)
printf("%s: check 3.0\n", FUNC);
#endif /* QAK */
/* Create the per-dimension selection info */
- if((new_diminfo = H5MM_malloc(sizeof(H5S_hyper_dim_t *)*src->extent.u.simple.rank))==NULL)
+ if((new_diminfo = H5MM_malloc(sizeof(H5S_hyper_dim_t)*
+ src->extent.u.simple.rank))==NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"can't allocate per-dimension array");
diff --git a/src/H5Z.c b/src/H5Z.c
index e2059ee..b6d44f8 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -117,8 +117,8 @@ H5Z_term_interface (void)
/* Print the statistics */
HDfprintf (stderr,
- " %c%-15s %10Hd %10Hd %8.2f %8.2f %8.2f "
- "%10s\n", dir?'<':'>', comment,
+ " %s%-15s %10Hd %10Hd %8.2f %8.2f %8.2f "
+ "%10s\n", dir?"<":">", comment,
H5Z_table_g[i].stats[dir].total,
H5Z_table_g[i].stats[dir].errors,
H5Z_table_g[i].stats[dir].timer.utime,
@@ -310,6 +310,8 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, uintn flags,
for (i=0; i<cd_nelmts; i++) {
pline->filter[idx].cd_values[i] = cd_values[i];
}
+ } else {
+ pline->filter[idx].cd_values = NULL;
}
pline->nfilters++;