diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-27 13:34:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-27 13:34:28 (GMT) |
| commit | fefbe61aca1a42e716e900be7af5b382be5e19c1 (patch) | |
| tree | dbb600c8b6555569a4d94ff69b24e72c4787693d /hl | |
| parent | 538d37a1bcc15a600c71fad0566d8480c2344ee6 (diff) | |
| download | hdf5-fefbe61aca1a42e716e900be7af5b382be5e19c1.zip hdf5-fefbe61aca1a42e716e900be7af5b382be5e19c1.tar.gz hdf5-fefbe61aca1a42e716e900be7af5b382be5e19c1.tar.bz2 | |
[svn-r11304] Purpose:
Code cleanup (sorta)
Description:
Adjust H5G_stat_t to prepare for eventual "external link" information.
This also puts the information for regular objects and soft links into more
obviously separate places.
Platforms tested:
FreeBSD 4.11 (sleipnir)
Linux 2.4
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/src/H5DS.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index b77b97f..b88020b 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -148,7 +148,7 @@ herr_t H5DSattach_scale(hid_t did, return FAIL; /* same object, not valid */ - if (sb1.fileno==sb2.fileno && sb1.objno==sb2.objno) + if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) return FAIL; /* get ID type */ @@ -325,7 +325,7 @@ herr_t H5DSattach_scale(hid_t did, goto out; /* same object, so this DS scale is already in this DIM IDX */ - if (sb1.fileno==sb2.fileno && sb1.objno==sb2.objno) + if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) { found_ds = 1; } @@ -602,7 +602,7 @@ herr_t H5DSdetach_scale(hid_t did, return FAIL; /* same object, not valid */ - if (sb1.fileno==sb2.fileno && sb1.objno==sb2.objno) + if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) return FAIL; /* get ID type */ @@ -696,7 +696,7 @@ herr_t H5DSdetach_scale(hid_t did, goto out; /* same object, reset */ - if (sb1.fileno==sb2.fileno && sb1.objno==sb2.objno) + if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) { for(jj=j; jj<buf[idx].len-1; jj++) { @@ -781,7 +781,7 @@ herr_t H5DSdetach_scale(hid_t did, goto out; /* same object, reset. we want to detach only for this DIM */ - if (sb3.fileno==sb4.fileno && sb3.objno==sb4.objno && (int)idx==dsbuf[i].dim_idx) + if (sb3.fileno==sb4.fileno && sb3.u.obj.objno==sb4.u.obj.objno && (int)idx==dsbuf[i].dim_idx) { for(jj=i; jj<nelmts-1; jj++) { @@ -1787,7 +1787,7 @@ htri_t H5DSis_attached(hid_t did, return FAIL; /* same object, not valid */ - if (sb1.fileno==sb2.fileno && sb1.objno==sb2.objno) + if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) return FAIL; /* get ID type */ @@ -1869,7 +1869,7 @@ htri_t H5DSis_attached(hid_t did, goto out; /* same object */ - if (sb1.fileno==sb2.fileno && sb1.objno==sb2.objno) + if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) { found_ds = 1; } @@ -1957,7 +1957,7 @@ htri_t H5DSis_attached(hid_t did, goto out; /* same object */ - if (sb3.fileno==sb4.fileno && sb3.objno==sb4.objno && (int)idx==dsbuf[i].dim_idx) { + if (sb3.fileno==sb4.fileno && sb3.u.obj.objno==sb4.u.obj.objno && (int)idx==dsbuf[i].dim_idx) { found_dset=1; } /* if */ |