summaryrefslogtreecommitdiffstats
path: root/src/H5.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-08-27 16:48:50 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-08-27 16:48:50 (GMT)
commiteb5e01d37ca2570afc50756c9ed6a0be214502ec (patch)
tree08281269dc5b2eeef48286fb991bd6a05f71f6a3 /src/H5.c
parent11f1b67c878b17abc225d09fb2a2019f338f92b2 (diff)
downloadhdf5-eb5e01d37ca2570afc50756c9ed6a0be214502ec.zip
hdf5-eb5e01d37ca2570afc50756c9ed6a0be214502ec.tar.gz
hdf5-eb5e01d37ca2570afc50756c9ed6a0be214502ec.tar.bz2
[svn-r620] Changes since 19980825
---------------------- ./MANIFEST ./src/H5R.c [NEW] ./src/H5Rprivate.h [NEW] ./src/H5Rpublic.h [NEW] ./src/Makefile.in ./src/hdf5.h ./test/ragged.c [NEW] Preliminary support for 2d ragged arrays for Mark Miller and Jim Reus. Not fully implemented yet. The test is not actually part of `make test' because we still have some memory problems. ./src/H5E.c ./src/H5Epublic.h Added H5E_RAGGED as a major error number. ./bin/release Checks the MANIFEST file against `svf ls' on systems that have it. ./bin/trace Fixed a bug that caused arguments of type `void *x[]' to not be handled. ./src/H5.c Removed unused variables and changed a couple types to fix compiler warnings. Added tracing support for ragged array object ID's and arrays of pointers. ./src/H5D.c H5Dcreate() will complain if either of the property lists are invalid (instead of using the default). ./src/H5D.c ./src/H5Dprivate.h Split H5Dget_space() into an API and internal function so it can be called from the new ragged array layer. ./src/H5Fistore.c Fixed warnings about unsigned vs. signed comparisons. ./src/H5Flow.c Fixed a warning about a variable being shadowed in the MPI-IO stuff. ./src/H5Iprivate.h ./src/H5Ipublic.h Added the H5_RAGGED atom group. ./src/H5Shyper.c Fixed some freeing-free-memory errors that resulted when certain arrays were freed but the pointers were left in the data structures. I simply set the pointers to null after they were freed. ./src/H5Sprivate.h ./src/H5Sselect.c Split the H5Sselect_hyperslab() function into an API and a private function so it could be called from the ragged array layer. Added H5S_SEL_ERROR and H5S_SEL_N to the switch statements to get rid or compiler warnings. ./src/H5Tconv.c Removed a misleading comment. ./test/bittests.c Fixed a warning about a printf(). ./test/cmpd_dset.c Fixed warnings about unused variables because of test #11 being commented out. ./bin/trace Shortened the right margin for the output to allow room for the `);' at the end of the TRACE() macros.
Diffstat (limited to 'src/H5.c')
-rw-r--r--src/H5.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/src/H5.c b/src/H5.c
index 465cbb2..0db7f28 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -92,8 +92,6 @@ DESCRIPTION
herr_t
H5_init_library(void)
{
- const char *s = NULL;
-
FUNC_ENTER_INIT(H5_init_library, NULL, FAIL);
/*
@@ -349,7 +347,8 @@ H5_debug_mask(const char *s)
{
FILE *stream = stderr;
char pkg_name[32], *rest;
- int i, clear;
+ size_t i;
+ int clear;
while (s && *s) {
if (isalpha(*s) || '-'==*s || '+'==*s) {
@@ -1685,6 +1684,12 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
fprintf(out, " (tbuf");
}
break;
+ case H5_RAGGED:
+ fprintf(out, "%ld", (long)obj);
+ if (strcmp(argname, "array")) {
+ fprintf(out, " (array)");
+ }
+ break;
default:
fprintf(out, "%ld", (long)obj);
fprintf (out, " (unknown class)");
@@ -2120,6 +2125,19 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
if (ptr) {
if (vp) {
fprintf (out, "0x%lx", (unsigned long)vp);
+ if (asize_idx>=0 && asize[asize_idx]>=0) {
+ void **p = (void**)vp;
+ fprintf(out, " {");
+ for (i=0; i<asize[asize_idx]; i++) {
+ if (p[i]) {
+ fprintf(out, "%s0x%lx", i?", ":"",
+ (unsigned long)(p[i]));
+ } else {
+ fprintf(out, "%sNULL", i?", ":"");
+ }
+ }
+ fprintf(out, "}");
+ }
} else {
fprintf(out, "NULL");
}