BIND 10 trac2850_2, updated. 10f2ae4625a238a4899372432df13d29eca9f9b3 [2850] some editorial/style cleanups:
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 2 05:58:37 UTC 2013
The branch, trac2850_2 has been updated
via 10f2ae4625a238a4899372432df13d29eca9f9b3 (commit)
from bd7e56727b6d8228f2fdc685bff3a18349415c69 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 10f2ae4625a238a4899372432df13d29eca9f9b3
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed May 1 22:55:04 2013 -0700
[2850] some editorial/style cleanups:
- include style ("" vs <>) per consensus
- null pointer comparison style
- documentation wording fix
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/memory/zone_writer.cc | 9 ++++-----
src/lib/datasrc/memory/zone_writer.h | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/zone_writer.cc b/src/lib/datasrc/memory/zone_writer.cc
index 86d09e9..b4d7232 100644
--- a/src/lib/datasrc/memory/zone_writer.cc
+++ b/src/lib/datasrc/memory/zone_writer.cc
@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include "zone_writer.h"
-#include "zone_data.h"
+#include <datasrc/memory/zone_writer.h>
+#include <datasrc/memory/zone_data.h>
#include <memory>
@@ -49,7 +49,7 @@ ZoneWriter::load() {
zone_data_ = load_action_(segment_->getMemorySegment());
- if (zone_data_ == NULL) {
+ if (!zone_data_) {
// Bug inside load_action_.
isc_throw(isc::InvalidOperation, "No data returned from load action");
}
@@ -63,9 +63,8 @@ ZoneWriter::install() {
isc_throw(isc::InvalidOperation, "No data to install");
}
-
ZoneTable* table(segment_->getHeader().getTable());
- if (table == NULL) {
+ if (!table) {
isc_throw(isc::Unexpected, "No zone table present");
}
const ZoneTable::AddResult result(table->addZone(
diff --git a/src/lib/datasrc/memory/zone_writer.h b/src/lib/datasrc/memory/zone_writer.h
index 633ba1e..c77dea2 100644
--- a/src/lib/datasrc/memory/zone_writer.h
+++ b/src/lib/datasrc/memory/zone_writer.h
@@ -15,8 +15,8 @@
#ifndef MEM_ZONE_WRITER_H
#define MEM_ZONE_WRITER_H
-#include "zone_table_segment.h"
-#include "load_action.h"
+#include <datasrc/memory/zone_table_segment.h>
+#include <datasrc/memory/load_action.h>
#include <dns/rrclass.h>
#include <dns/name.h>
@@ -27,7 +27,7 @@ namespace memory {
/// \brief Does an update to a zone.
///
-/// This represents the work of a reload of a zone. The work is divided
+/// This represents the work of a (re)load of a zone. The work is divided
/// into three stages -- load(), install() and cleanup(). They should
/// be called in this order for the effect to take place.
///
More information about the bind10-changes
mailing list