diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-10 19:39:04 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-10 19:39:04 (GMT) |
| commit | 932101bb80e44e23ec8c2ed690f8fbc7bd08a47a (patch) | |
| tree | 0fe2bcd1e23814d17bf343a99858f50e97d540b8 /c++ | |
| parent | bdd61d8a80ba159748cd56ef59299ca749749ab6 (diff) | |
| download | hdf5-932101bb80e44e23ec8c2ed690f8fbc7bd08a47a.zip hdf5-932101bb80e44e23ec8c2ed690f8fbc7bd08a47a.tar.gz hdf5-932101bb80e44e23ec8c2ed690f8fbc7bd08a47a.tar.bz2 | |
[svn-r7201] Purpose:
Code cleanup
Description:
Finish converting the B-tree 'K' values to use unsigned integers, rather
than signed ones, since negative amounts of entries in a B-tree node aren't
meaningful.
Platforms tested:
FreeBSD 4.8 (sleipnir)
h5committest
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/H5FcreatProp.cpp | 10 | ||||
| -rw-r--r-- | c++/src/H5FcreatProp.h | 8 | ||||
| -rw-r--r-- | c++/test/tfile.cpp | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp index c59aa11..e28a891 100644 --- a/c++/src/H5FcreatProp.cpp +++ b/c++/src/H5FcreatProp.cpp @@ -86,7 +86,7 @@ void FileCreatPropList::getSizes( size_t& sizeof_addr, size_t& sizeof_size ) con } } -void FileCreatPropList::setSymk( int ik, unsigned lk ) const +void FileCreatPropList::setSymk( unsigned ik, unsigned lk ) const { herr_t ret_value = H5Pset_sym_k( id, ik, lk ); if( ret_value < 0 ) @@ -96,7 +96,7 @@ void FileCreatPropList::setSymk( int ik, unsigned lk ) const } } -void FileCreatPropList::getSymk( int& ik, unsigned& lk ) const +void FileCreatPropList::getSymk( unsigned& ik, unsigned& lk ) const { herr_t ret_value = H5Pget_sym_k( id, &ik, &lk ); if( ret_value < 0 ) @@ -106,7 +106,7 @@ void FileCreatPropList::getSymk( int& ik, unsigned& lk ) const } } -void FileCreatPropList::setIstorek( int ik ) const +void FileCreatPropList::setIstorek( unsigned ik ) const { herr_t ret_value = H5Pset_istore_k( id, ik ); if( ret_value < 0 ) @@ -115,9 +115,9 @@ void FileCreatPropList::setIstorek( int ik ) const "H5Pset_istore_k failed"); } } -int FileCreatPropList::getIstorek() const +unsigned FileCreatPropList::getIstorek() const { - int ik; + unsigned ik; herr_t ret_value = H5Pget_istore_k( id, &ik ); if( ret_value < 0 ) { diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h index d1ec817..5b73e42 100644 --- a/c++/src/H5FcreatProp.h +++ b/c++/src/H5FcreatProp.h @@ -48,18 +48,18 @@ class H5_DLLCPP FileCreatPropList : public PropList { void getSizes( size_t& sizeof_addr, size_t& sizeof_size ) const; // Sets the size of parameters used to control the symbol table nodes. - void setSymk( int int_nodes_k, unsigned leaf_nodes_k ) const; + void setSymk( unsigned int_nodes_k, unsigned leaf_nodes_k ) const; // Retrieves the size of the symbol table B-tree 1/2 rank and the // symbol table leaf node 1/2 size. - void getSymk( int& int_nodes_k, unsigned& leaf_nodes_k ) const; + void getSymk( unsigned& int_nodes_k, unsigned& leaf_nodes_k ) const; // Sets the size of parameter used to control the B-trees for // indexing chunked datasets. - void setIstorek( int ik ) const; + void setIstorek( unsigned ik ) const; // Returns the 1/2 rank of an indexed storage B-tree. - int getIstorek() const; + unsigned getIstorek() const; // Creates a copy of an existing file create property list // using the property list id diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index 37cc5e1..a911e65 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -152,8 +152,7 @@ test_file_create(void) VERIFY(parm1, F1_OFFSET_SIZE, "FileCreatPropList::getSizes"); VERIFY(parm2, F1_LENGTH_SIZE, "FileCreatPropList::getSizes"); - int iparm1; /*file-creation parameters */ - unsigned iparm2; /*file-creation parameters */ + unsigned iparm1,iparm2; /*file-creation parameters */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F1_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F1_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -202,8 +201,7 @@ test_file_create(void) VERIFY(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes"); VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); - int iparm1; /*file-creation parameters */ - unsigned iparm2; /*file-creation parameters */ + unsigned iparm1,iparm2; /*file-creation parameters */ tmpl1->getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -285,8 +283,7 @@ test_file_open(void) VERIFY(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes"); VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); - int iparm1; /*file-creation parameters */ - unsigned iparm2; /*file-creation parameters */ + unsigned iparm1,iparm2; /*file-creation parameters */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); |