Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adam Osuchowski
Kea
Commits
2a8f04d9
Commit
2a8f04d9
authored
Dec 18, 2012
by
JINMEI Tatuya
Browse files
[2470] Revert "[2470] provide RR collator with issue callbacks"
This reverts commit
822fa315
.
parent
15d0b77b
Changes
1
Show whitespace changes
Inline
Side-by-side
src/lib/datasrc/memory/zone_data_loader.cc
View file @
2a8f04d9
...
@@ -193,12 +193,12 @@ masterLoaderWrapper(const char* const filename, const Name& origin,
...
@@ -193,12 +193,12 @@ masterLoaderWrapper(const char* const filename, const Name& origin,
const
RRClass
&
zone_class
,
LoadCallback
callback
)
const
RRClass
&
zone_class
,
LoadCallback
callback
)
{
{
bool
load_ok
=
false
;
// (we don't use it)
bool
load_ok
=
false
;
// (we don't use it)
const
MasterLoaderCallbacks
issue_callbacks
=
dns
::
RRCollator
collator
(
boost
::
bind
(
callback
,
_1
));
createMasterLoaderCallbacks
(
origin
,
zone_class
,
&
load_ok
);
dns
::
RRCollator
collator
(
boost
::
bind
(
callback
,
_1
),
issue_callbacks
);
try
{
try
{
dns
::
MasterLoader
(
filename
,
origin
,
zone_class
,
issue_callbacks
,
dns
::
MasterLoader
(
filename
,
origin
,
zone_class
,
createMasterLoaderCallbacks
(
origin
,
zone_class
,
&
load_ok
),
collator
.
getCallback
()).
load
();
collator
.
getCallback
()).
load
();
collator
.
flush
();
collator
.
flush
();
}
catch
(
const
dns
::
MasterLoaderError
&
e
)
{
}
catch
(
const
dns
::
MasterLoaderError
&
e
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment