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/H5Gent.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/H5Gent.c')
| -rw-r--r-- | src/H5Gent.c | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/src/H5Gent.c b/src/H5Gent.c index cec788c..ad4c058 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -17,25 +17,63 @@ * Programmer: Robb Matzke <matzke@llnl.gov> * Friday, September 19, 1997 */ + +/****************/ +/* Module Setup */ +/****************/ + #define H5G_PACKAGE /*suppress error about including H5Gpkg */ -#define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Packages needed by this file... */ +/***********/ +/* Headers */ +/***********/ #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ -#include "H5Fpkg.h" /* File access */ +#include "H5Fprivate.h" /* File access */ #include "H5FLprivate.h" /* Free Lists */ #include "H5Gpkg.h" /* Groups */ #include "H5HLprivate.h" /* Local Heaps */ -/* Private macros */ -/* Private prototypes */ +/****************/ +/* Local Macros */ +/****************/ + + +/******************/ +/* Local Typedefs */ +/******************/ + + +/********************/ +/* Package Typedefs */ +/********************/ + + +/********************/ +/* Local Prototypes */ +/********************/ + + +/*********************/ +/* Package Variables */ +/*********************/ /* Declare extern the PQ free list for the wrapped strings */ H5FL_BLK_EXTERN(str_buf); + +/*****************************/ +/* Library Private Variables */ +/*****************************/ + + +/*******************/ +/* Local Variables */ +/*******************/ + + /*------------------------------------------------------------------------- * Function: H5G_ent_decode_vec @@ -249,7 +287,7 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent) /* fill with zero */ if(*pp < p_ret) - HDmemset(*pp, 0, (p_ret - *pp)); + HDmemset(*pp, 0, (size_t)(p_ret - *pp)); *pp = p_ret; done: |