mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 22:45:18 +00:00
Code Issues Releases Wiki Activity

[2206] Change getHeader() to return a reference

Browse Source
This commit is contained in:
Mukund Sivaraman
2012-10-03 11:11:02 +05:30
parent c4c3946bad
commit 1fb24f540a
4 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/datasrc/memory/zone_table_segment.h
View File

@@ -71,14 +71,10 @@ public:
virtual ~ZoneTableSegment() {} virtual ~ZoneTableSegment() {}
/// \brief Return the ZoneTableHeader for the zone table segment. /// \brief Return the ZoneTableHeader for the zone table segment.
/// virtual ZoneTableHeader& getHeader() = 0;
/// NOTE: This method should never return \c NULL.
virtual ZoneTableHeader* getHeader() = 0;
/// \brief const version of \c getHeader(). /// \brief const version of \c getHeader().
/// virtual const ZoneTableHeader& getHeader() const = 0;
/// NOTE: This method should never return \c NULL.
virtual const ZoneTableHeader* getHeader() const = 0;
/// \brief Return the MemorySegment for the zone table segment. /// \brief Return the MemorySegment for the zone table segment.
virtual isc::util::MemorySegment& getMemorySegment() = 0; virtual isc::util::MemorySegment& getMemorySegment() = 0;

8
src/lib/datasrc/memory/zone_table_segment_local.cc
View File

@@ -20,14 +20,14 @@ namespace isc {
namespace datasrc { namespace datasrc {
namespace memory { namespace memory {
ZoneTableHeader* ZoneTableHeader&
ZoneTableSegmentLocal::getHeader() { ZoneTableSegmentLocal::getHeader() {
return (&header_); return (header_);
} }
const ZoneTableHeader* const ZoneTableHeader&
ZoneTableSegmentLocal::getHeader() const { ZoneTableSegmentLocal::getHeader() const {
return (&header_); return (header_);
} }
MemorySegment& MemorySegment&

8
src/lib/datasrc/memory/zone_table_segment_local.h
View File

@@ -45,14 +45,10 @@ public:
/// \brief Return the ZoneTableHeader for the local zone table /// \brief Return the ZoneTableHeader for the local zone table
/// segment implementation. /// segment implementation.
/// virtual ZoneTableHeader& getHeader();
/// NOTE: This method will never return \c NULL.
virtual ZoneTableHeader* getHeader();
/// \brief const version of \c getHeader(). /// \brief const version of \c getHeader().
/// virtual const ZoneTableHeader& getHeader() const;
/// NOTE: This method will never return \c NULL.
virtual const ZoneTableHeader* getHeader() const;
/// \brief Return the MemorySegment for the local zone table segment /// \brief Return the MemorySegment for the local zone table segment
/// implementation (a MemorySegmentLocal instance). /// implementation (a MemorySegmentLocal instance).

13
src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
View File

@@ -55,23 +55,20 @@ TEST_F(ZoneTableSegmentTest, create) {
} }
TEST_F(ZoneTableSegmentTest, getHeader) { TEST_F(ZoneTableSegmentTest, getHeader) {
// getHeader() should never return NULL. ZoneTableHeader& header = segment_->getHeader();
ZoneTableHeader* header = segment_->getHeader();
EXPECT_NE(static_cast<void*>(NULL), header);
// The zone table is unset. // The zone table is unset.
ZoneTable* table = header->getTable(); ZoneTable* table = header.getTable();
EXPECT_EQ(static_cast<void*>(NULL), table); EXPECT_EQ(static_cast<void*>(NULL), table);
} }
TEST_F(ZoneTableSegmentTest, getHeaderConst) { TEST_F(ZoneTableSegmentTest, getHeaderConst) {
// getHeader() should never return NULL. // Test const methods
const ZoneTableHeader* header = const ZoneTableHeader& header =
static_cast<const ZoneTableSegment*>(segment_)->getHeader(); static_cast<const ZoneTableSegment*>(segment_)->getHeader();
EXPECT_NE(static_cast<void*>(NULL), header);
// The zone table is unset. // The zone table is unset.
const ZoneTable* table = header->getTable(); const ZoneTable* table = header.getTable();
EXPECT_EQ(static_cast<void*>(NULL), table); EXPECT_EQ(static_cast<void*>(NULL), table);
} }