summaryrefslogtreecommitdiffstats
path: root/src/H5G.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-02-25 15:40:27 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-02-25 15:40:27 (GMT)
commit17535fbc174978ae71d916a02ee4dacee66a9d8c (patch)
treed3114488ba01370e6b21acca5915c4f771125713 /src/H5G.c
parentd8b07ce1d025e3f4284c5038347097180fc2da11 (diff)
downloadhdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.zip
hdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.tar.gz
hdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.tar.bz2
[svn-r1101] Changes since 19990219
---------------------- ./config/irix64 The old (-32) compiler is now supported by setting envrionment CC='cc -32'. The -64 compiler is the default or you can set CC='cc -64'. ./src/H5A.c ./src/H5D.c ./src/H5F.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5G.c ./src/H5I.c ./src/H5Ocomp.c ./src/H5P.c ./src/H5R.c ./src/H5RA.c ./src/H5T.c ./src/H5Tbit.c ./src/H5Tconv.c ./src/H5Z.c ./src/H5detect.c ./test/big.c ./test/cmpd_dset.c ./test/dsets.c ./test/dtypes.c ./test/enum.c ./test/mtime.c ./test/ohdr.c ./tools/h5ls.c Fixed lots of warnings on Irix64. Mailed a few remaining warnings in H5S to Quincey and a few in the dumper to Ruey-Hsia.
Diffstat (limited to 'src/H5G.c')
-rw-r--r--src/H5G.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/H5G.c b/src/H5G.c
index fd7659e..b75f20f 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -873,14 +873,13 @@ H5G_component(const char *name, size_t *size_p)
static const char *
H5G_basename(const char *name, size_t *size_p)
{
- size_t i, end;
+ size_t i;
FUNC_ENTER(H5G_basename, NULL);
/* Find the end of the base name */
i = strlen(name);
while (i>0 && '/'==name[i-1]) --i;
- end = i;
/* Skip backward over base name */
while (i>0 && '/'!=name[i-1]) --i;
@@ -1770,6 +1769,7 @@ H5G_loc (hid_t loc_id)
case H5I_NGROUPS:
case H5I_BADID:
case H5I_FILE_CLOSING:
+ case H5I_REFERENCE:
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid object ID");
}
@@ -2005,10 +2005,12 @@ H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link,
} else {
/* Some other type of object */
statbuf->objno[0] = (unsigned long)(obj_ent.header.offset);
- if (sizeof(obj_ent.header.offset)>sizeof(long)) {
- statbuf->objno[1] = (unsigned long)(obj_ent.header.offset >>
- 8*sizeof(long));
- }
+#if SIZEOF_UINT64_T>SIZEOF_LONG
+ statbuf->objno[1] = (unsigned long)(obj_ent.header.offset >>
+ 8*sizeof(long));
+#else
+ statbuf->objno[1] = 0;
+#endif
statbuf->nlink = H5O_link (&obj_ent, 0);
statbuf->type = H5G_LINK;
if (NULL==H5O_read(&obj_ent, H5O_MTIME, 0, &(statbuf->mtime))) {