diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-19 22:47:59 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-19 22:47:59 (GMT) |
| commit | d7e8828f70bcc1395e8511e8198d2bacab8f9661 (patch) | |
| tree | 30567c79ca101ce809ac3ee2fa598abe43c33b8e /src/H5G.c | |
| parent | 27775305d6a0d314b65457df5c3b4fcb8a67677a (diff) | |
| download | hdf5-d7e8828f70bcc1395e8511e8198d2bacab8f9661.zip hdf5-d7e8828f70bcc1395e8511e8198d2bacab8f9661.tar.gz hdf5-d7e8828f70bcc1395e8511e8198d2bacab8f9661.tar.bz2 | |
[svn-r21126] Description:
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/64 2.6 (heiwa) w/debug
Linux/64 2.6 (ember) w/parallel
Diffstat (limited to 'src/H5G.c')
| -rw-r--r-- | src/H5G.c | 50 |
1 files changed, 41 insertions, 9 deletions
@@ -75,27 +75,41 @@ *------------------------------------------------------------------------- */ -#define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/****************/ +/* Module Setup */ +/****************/ + #define H5G_PACKAGE /*suppress error about including H5Gpkg */ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5G_init_interface -/* Packages needed by this file... */ + +/***********/ +/* Headers */ +/***********/ #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ #include "H5Eprivate.h" /* Error handling */ -#include "H5Fpkg.h" /* File access */ +#include "H5Fprivate.h" /* File access */ +#include "H5FOprivate.h" /* File objects */ #include "H5Gpkg.h" /* Groups */ #include "H5Iprivate.h" /* IDs */ #include "H5Lprivate.h" /* Links */ #include "H5MMprivate.h" /* Memory management */ #include "H5Pprivate.h" /* Property lists */ -/* Local macros */ + +/****************/ +/* Local Macros */ +/****************/ + #define H5G_RESERVED_ATOMS 0 -/* Local typedefs */ + +/******************/ +/* Local Typedefs */ +/******************/ /* User data for path traversal routine for "insertion file" routine */ typedef struct { @@ -126,10 +140,21 @@ typedef struct { } H5G_iter_visit_ud_t; -/* Package variables */ +/********************/ +/* Package Typedefs */ +/********************/ + +/********************/ +/* Local Prototypes */ +/********************/ -/* Local variables */ +static herr_t H5G_open_oid(H5G_t *grp, hid_t dxpl_id); + + +/*********************/ +/* Package Variables */ +/*********************/ /* Declare a free list to manage the H5G_t struct */ H5FL_DEFINE(H5G_t); @@ -139,8 +164,15 @@ H5FL_DEFINE(H5G_shared_t); H5FL_DEFINE(H5_obj_t); -/* Private prototypes */ -static herr_t H5G_open_oid(H5G_t *grp, hid_t dxpl_id); +/*****************************/ +/* Library Private Variables */ +/*****************************/ + + +/*******************/ +/* Local Variables */ +/*******************/ + /*------------------------------------------------------------------------- |