diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-04-14 22:21:54 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-04-14 22:21:54 (GMT) |
| commit | 2521c4084c06f078846fe06bb1d3cd7bfa506316 (patch) | |
| tree | 466b9213c163d812778434bba2097705b423e799 /hl/src | |
| parent | 3468ff3a5c4f6c384801edef9ae52ecc4f2de3c5 (diff) | |
| download | hdf5-2521c4084c06f078846fe06bb1d3cd7bfa506316.zip hdf5-2521c4084c06f078846fe06bb1d3cd7bfa506316.tar.gz hdf5-2521c4084c06f078846fe06bb1d3cd7bfa506316.tar.bz2 | |
[svn-r12254] Purpose:
Anti-feature
Description:
Revert changes to H5G_stat_t struct, to make it compatible with the 1.6.x
branch again. The information that was added to the H5G_stat_t struct will
be reported through other API routines.
Platforms tested:
FreeBSD 4.11 (sleipnir) w/C++
Linux 2.4/64 (mir) w/C++ & Fortran
Solaris 2.9 (shanti)
Diffstat (limited to 'hl/src')
| -rw-r--r-- | hl/src/H5DS.c | 18 | ||||
| -rw-r--r-- | hl/src/H5IMpublic.h | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index 0c8c201..c3e1dc3 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -157,7 +157,7 @@ herr_t H5DSattach_scale(hid_t did, return FAIL; /* same object, not valid */ - if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) + if (!HDmemcmp(&sb1.fileno, &sb2.fileno, sizeof(sb1.fileno)) && !HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno))) return FAIL; /* get ID type */ @@ -334,7 +334,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.u.obj.objno==sb2.u.obj.objno) + if (!HDmemcmp(&sb1.fileno, &sb2.fileno, sizeof(sb1.fileno)) && !HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno))) { found_ds = 1; } @@ -620,7 +620,7 @@ herr_t H5DSdetach_scale(hid_t did, return FAIL; /* same object, not valid */ - if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) + if (!HDmemcmp(&sb1.fileno, &sb2.fileno, sizeof(sb1.fileno)) && !HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno))) return FAIL; /* get ID type */ @@ -714,7 +714,7 @@ herr_t H5DSdetach_scale(hid_t did, goto out; /* same object, reset */ - if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) + if (!HDmemcmp(&sb1.fileno, &sb2.fileno, sizeof(sb1.fileno)) && !HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno))) { for(jj=j; jj<buf[idx].len-1; jj++) { @@ -799,7 +799,8 @@ 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.u.obj.objno==sb4.u.obj.objno && (int)idx==dsbuf[i].dim_idx) + if (!HDmemcmp(&sb3.fileno, &sb4.fileno, sizeof(sb3.fileno)) && !HDmemcmp(&sb3.objno, &sb4.objno, sizeof(sb3.objno)) + && (int)idx==dsbuf[i].dim_idx) { for(jj=i; jj<nelmts-1; jj++) { @@ -984,7 +985,7 @@ htri_t H5DSis_attached(hid_t did, return FAIL; /* same object, not valid */ - if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) + if (!HDmemcmp(&sb1.fileno, &sb2.fileno, sizeof(sb1.fileno)) && !HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno))) return FAIL; /* get ID type */ @@ -1066,7 +1067,7 @@ htri_t H5DSis_attached(hid_t did, goto out; /* same object */ - if (sb1.fileno==sb2.fileno && sb1.u.obj.objno==sb2.u.obj.objno) + if (!HDmemcmp(&sb1.fileno, &sb2.fileno, sizeof(sb1.fileno)) && !HDmemcmp(&sb1.objno, &sb2.objno, sizeof(sb1.objno))) { found_ds = 1; } @@ -1154,7 +1155,8 @@ htri_t H5DSis_attached(hid_t did, goto out; /* same object */ - if (sb3.fileno==sb4.fileno && sb3.u.obj.objno==sb4.u.obj.objno && (int)idx==dsbuf[i].dim_idx) { + if (!HDmemcmp(&sb3.fileno, &sb4.fileno, sizeof(sb3.fileno)) && !HDmemcmp(&sb3.objno, &sb4.objno, sizeof(sb3.objno)) + && (int)idx==dsbuf[i].dim_idx) { found_dset=1; } /* if */ diff --git a/hl/src/H5IMpublic.h b/hl/src/H5IMpublic.h index a14f2f2..6b44168 100644 --- a/hl/src/H5IMpublic.h +++ b/hl/src/H5IMpublic.h @@ -79,10 +79,6 @@ H5_HLDLL herr_t H5IMis_image( hid_t loc_id, H5_HLDLL herr_t H5IMis_palette( hid_t loc_id, const char *dset_name ); -H5_HLDLL herr_t H5IM_find_palette(hid_t loc_id ); - - - #ifdef __cplusplus } #endif |