Commit bd8b562b authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2209] style fixes: folded long lines, constify, ptr vs bool

parent ecabe80c
......@@ -345,7 +345,7 @@ ConfigurableClientList::findInternal(MutableResult& candidate,
// duplicate code, it is a thin wrapper around getCachedZoneWriter only.
ConfigurableClientList::ReloadResult
ConfigurableClientList::reload(const Name& name) {
ZoneWriterPair result(getCachedZoneWriter(name));
const ZoneWriterPair result(getCachedZoneWriter(name));
if (result.second) {
result.second->load();
result.second->install();
......@@ -412,7 +412,7 @@ ConfigurableClientList::getCachedZoneWriter(const Name& name) {
}
memory::LoadAction load_action;
DataSourceClient* client(result.info->data_src_client_);
if (client) {
if (client != NULL) {
// Now finally provide the writer.
// If it does not exist in client,
// DataSourceError is thrown, which is exactly the result what we
......@@ -436,8 +436,9 @@ ConfigurableClientList::getCachedZoneWriter(const Name& name) {
filename);
}
return (ZoneWriterPair(ZONE_RELOADED,
ZoneWriterPtr(result.info->cache_->getZoneTableSegment().
getZoneWriter(load_action, name, rrclass_))));
ZoneWriterPtr(
result.info->cache_->getZoneTableSegment().
getZoneWriter(load_action, name, rrclass_))));
}
// NOTE: This function is not tested, it would be complicated. However, the
......
......@@ -308,9 +308,10 @@ public:
///
/// \param zone The origin of the zone to reload.
/// \return The result has two parts. The first one is a status describing
/// if it worked or not (and in case it didn't, also why). If the status
/// is ZONE_RELOADED, the second part contains a shared pointer to the
/// writer. If the status is anything else, the second part is NULL.
/// if it worked or not (and in case it didn't, also why). If the
/// status is ZONE_RELOADED, the second part contains a shared pointer
/// to the writer. If the status is anything else, the second part is
/// NULL.
/// \throw DataSourceError or anything else that the data source
/// containing the zone might throw is propagated.
/// \throw DataSourceError if something unexpected happens, like when
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment