diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-20 02:25:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-20 02:25:35 (GMT) |
| commit | cc3bdaa6d905f21d3c9387e811270ce9f03dced0 (patch) | |
| tree | 1668b4b5dd73d318a36d8ca689b3d0749819186e /src/H5Gobj.c | |
| parent | c021348b268169d25efb5f5f975e65da79c15a8d (diff) | |
| download | hdf5-cc3bdaa6d905f21d3c9387e811270ce9f03dced0.zip hdf5-cc3bdaa6d905f21d3c9387e811270ce9f03dced0.tar.gz hdf5-cc3bdaa6d905f21d3c9387e811270ce9f03dced0.tar.bz2 | |
[svn-r21130] Description:
Bring r21126 from trunk to 1.8 branch:
Clean up some compiler warnings, but mainly an interim checkin on the
path of reducing code coupling in the library by removing most of the places
which were accessing H5F package definitions.
Tested on:
Mac OS X/32 10.6.8 (amazon) w/debug
FreeBSD/32 8.2 (loyalty) w/debug
FreeBSD/64 8.2 (freedom) w/debug
Linux/32 2.6 (jam) w/debug
Linux/64 2.6 (koala) w/debug
Linux/64 2.6 (heiwa) w/debug
Diffstat (limited to 'src/H5Gobj.c')
| -rw-r--r-- | src/H5Gobj.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/H5Gobj.c b/src/H5Gobj.c index 16b202a..8580508 100644 --- a/src/H5Gobj.c +++ b/src/H5Gobj.c @@ -28,7 +28,6 @@ /* Module Setup */ /****************/ -#define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5G_PACKAGE /*suppress error about including H5Gpkg */ @@ -37,7 +36,7 @@ /***********/ #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ -#include "H5Fpkg.h" /* File access */ +#include "H5Fprivate.h" /* File access */ #include "H5Gpkg.h" /* Groups */ #include "H5HLprivate.h" /* Local Heaps */ #include "H5Iprivate.h" /* IDs */ @@ -81,6 +80,7 @@ typedef struct { hid_t dxpl_id; /* DXPL during insertion */ } H5G_obj_stab_it_ud1_t; + /********************/ /* Package Typedefs */ /********************/ @@ -202,7 +202,7 @@ H5G_obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo, HDassert(oloc); /* Check for invalid access request */ - if(0 == (f->intent & H5F_ACC_RDWR)) + if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR)) HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file") /* Check for using the latest version of the group format */ @@ -268,16 +268,19 @@ H5G_obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo, /* Check for format of group to create */ if(use_latest_format) { /* Insert link info message */ - if(H5O_msg_create(oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, linfo, dxpl_id) < 0) + /* (Casting away const OK - QAK) */ + if(H5O_msg_create(oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, (void *)linfo, dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message") /* Insert group info message */ - if(H5O_msg_create(oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, 0, ginfo, dxpl_id) < 0) + /* (Casting away const OK - QAK) */ + if(H5O_msg_create(oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, 0, (void *)ginfo, dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message") /* Insert pipeline message */ if(pline && pline->nused) - if(H5O_msg_create(oloc, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, pline, dxpl_id) < 0) + /* (Casting away const OK - QAK) */ + if(H5O_msg_create(oloc, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, (void *)pline, dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message") } /* end if */ else { |