summaryrefslogtreecommitdiff
path: root/hscript/script_e.cc
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-26 04:33:29 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-26 04:33:29 -0600
commit75f10ffe70935187bb900501866a8d555b83a855 (patch)
tree22e60be53af48fcec8465fef2681e9cd5f8cb36e /hscript/script_e.cc
parentca78cc8d66498cccf54ed26d5318f09362859ba7 (diff)
downloadhorizon-75f10ffe70935187bb900501866a8d555b83a855.tar.gz
horizon-75f10ffe70935187bb900501866a8d555b83a855.tar.bz2
horizon-75f10ffe70935187bb900501866a8d555b83a855.tar.xz
horizon-75f10ffe70935187bb900501866a8d555b83a855.zip
hscript: Refactor Keys to be owned by a Script*
This means that a Key can introspect its Script.
Diffstat (limited to 'hscript/script_e.cc')
-rw-r--r--hscript/script_e.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/hscript/script_e.cc b/hscript/script_e.cc
index 402eb88..8360b28 100644
--- a/hscript/script_e.cc
+++ b/hscript/script_e.cc
@@ -87,7 +87,7 @@ bool Script::execute() const {
output_error(phase, "The HorizonScript failed to execute",\
"Check the log file for more details.")
#define EXECUTE_OR_FAIL(phase, obj) \
- if(!obj->execute(opts)) {\
+ if(!obj->execute()) {\
EXECUTE_FAILURE(phase);\
return false;\
}
@@ -212,7 +212,7 @@ bool Script::execute() const {
}
for(auto &ssid : internal->ssids) {
- if(!ssid->execute(opts)) {
+ if(!ssid->execute()) {
EXECUTE_FAILURE("ssid");
/* "Soft" error. Not fatal. */
}
@@ -256,7 +256,7 @@ bool Script::execute() const {
}
for(auto &addr : internal->addresses) {
- if(!addr->execute(opts)) {
+ if(!addr->execute()) {
EXECUTE_FAILURE("netaddress");
/* "Soft" error. Not fatal. */
} else {