summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-03-10 19:00:39 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-03-10 19:00:39 (GMT)
commitb4ff3e6e79a46fb474eb1786a11a7d2451455111 (patch)
treeb73756af2d3eaee487c4087d55fbb04e1eba62b5 /hl
parentda5058310c324dcce93dc9328ef2bd53bf1fed02 (diff)
downloadhdf5-b4ff3e6e79a46fb474eb1786a11a7d2451455111.zip
hdf5-b4ff3e6e79a46fb474eb1786a11a7d2451455111.tar.gz
hdf5-b4ff3e6e79a46fb474eb1786a11a7d2451455111.tar.bz2
[svn-r16560] Description:
Remove another call to H5E_clear_stack() from within the library. Clean up lots of compiler warnings. Tested on: Mac OS X/32 10.5.6 (amazon) (followup on other platforms forthcoming)
Diffstat (limited to 'hl')
-rw-r--r--hl/src/H5IM.c9
-rw-r--r--hl/src/H5PT.c20
2 files changed, 15 insertions, 14 deletions
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 2fec7e0..479b572 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -512,7 +512,6 @@ herr_t H5IMlink_palette( hid_t loc_id,
hid_t attr_type=-1;
hid_t attr_id=-1;
hid_t attr_space_id=-1;
- hid_t attr_class=-1;
hobj_ref_t ref; /* write a new reference */
hobj_ref_t *refbuf; /* buffer to read references */
hssize_t n_refs;
@@ -579,7 +578,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
if((attr_type = H5Aget_type(attr_id)) < 0)
goto out;
- if((attr_class = H5Tget_class(attr_type)) < 0)
+ if(H5Tget_class(attr_type) < 0)
goto out;
/* Get and save the old reference(s) */
@@ -862,7 +861,6 @@ herr_t H5IMget_palette_info( hid_t loc_id,
hid_t attr_type=-1;
hid_t attr_id;
hid_t attr_space_id=-1;
- hid_t attr_class;
hssize_t n_refs;
hsize_t dim_ref;
hobj_ref_t *refbuf; /* buffer to read references */
@@ -885,7 +883,7 @@ herr_t H5IMget_palette_info( hid_t loc_id,
if((attr_type = H5Aget_type(attr_id)) < 0)
goto out;
- if((attr_class = H5Tget_class(attr_type)) < 0)
+ if(H5Tget_class(attr_type) < 0)
goto out;
/* Get the reference(s) */
@@ -976,7 +974,6 @@ herr_t H5IMget_palette( hid_t loc_id,
hid_t attr_type=-1;
hid_t attr_id;
hid_t attr_space_id=-1;
- hid_t attr_class;
hssize_t n_refs;
hsize_t dim_ref;
hobj_ref_t *refbuf; /* buffer to read references */
@@ -997,7 +994,7 @@ herr_t H5IMget_palette( hid_t loc_id,
if((attr_type = H5Aget_type(attr_id)) < 0)
goto out;
- if((attr_class = H5Tget_class(attr_type)) < 0)
+ if(H5Tget_class(attr_type) < 0)
goto out;
/* Get the reference(s) */
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index af6533e..10d2637 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -33,10 +33,10 @@ static H5I_type_t H5PT_ptable_id_type = H5I_UNINIT;
#define H5PT_HASH_TABLE_SIZE 64
/* Packet Table private functions */
-herr_t H5PT_close( htbl_t* table );
-herr_t H5PT_create_index(htbl_t *table_id);
-herr_t H5PT_set_index(htbl_t *table_id, hsize_t pt_index);
-herr_t H5PT_get_index(htbl_t *table_id, hsize_t *pt_index);
+static herr_t H5PT_close( htbl_t* table );
+static herr_t H5PT_create_index(htbl_t *table_id);
+static herr_t H5PT_set_index(htbl_t *table_id, hsize_t pt_index);
+static herr_t H5PT_get_index(htbl_t *table_id, hsize_t *pt_index);
/*-------------------------------------------------------------------------
*
@@ -306,7 +306,8 @@ out:
*
*-------------------------------------------------------------------------
*/
-herr_t H5PT_close( htbl_t* table)
+static herr_t
+H5PT_close( htbl_t* table)
{
if(table == NULL)
goto out;
@@ -559,7 +560,8 @@ out:
*
*-------------------------------------------------------------------------
*/
-herr_t H5PT_create_index(htbl_t *table)
+static herr_t
+H5PT_create_index(htbl_t *table)
{
if( table != NULL)
{
@@ -569,7 +571,8 @@ herr_t H5PT_create_index(htbl_t *table)
return -1;
}
-herr_t H5PT_set_index(htbl_t *table, hsize_t index)
+static herr_t
+H5PT_set_index(htbl_t *table, hsize_t index)
{
/* Ensure index is valid */
if( table != NULL )
@@ -583,7 +586,8 @@ herr_t H5PT_set_index(htbl_t *table, hsize_t index)
return -1;
}
-herr_t H5PT_get_index(htbl_t *table, hsize_t *index)
+static herr_t
+H5PT_get_index(htbl_t *table, hsize_t *index)
{
/* Ensure index is valid */
if( table != NULL )