[Debian-iot-packaging] [openzwave-controlpanel] 41/81: update with new Manager Controller Command API's

[Dara Adib]

This is an automated email from the git hooks/post-receive script.

daradib-guest pushed a commit to branch debian/master
in repository openzwave-controlpanel.

commit 59bca516f245bf80dd4b9ea7ac29eda1f3edfa91
Author: Justin Hammond <justin at dynam.ac>
Date:   Sat May 2 16:05:26 2015 +0800

    update with new Manager Controller Command API's
---
 webserver.cpp | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/webserver.cpp b/webserver.cpp
index 51d563a..1b493e2 100644
--- a/webserver.cpp
+++ b/webserver.cpp
@@ -1226,37 +1226,25 @@ int Webserver::Handler (struct MHD_Connection *conn, const char *url,
 					if (cp->conn_arg2 != NULL && strlen((char *)cp->conn_arg2) > 4) {
 						uint8 node = strtol(((char *)cp->conn_arg2) + 4, NULL, 10);
 						setAdminFunction("Request Node Neighbor Update");
-						setAdminState(
-								Manager::Get()->BeginControllerCommand(homeId,
-										Driver::ControllerCommand_RequestNodeNeighborUpdate,
-										web_controller_update, this, true, node));
+						setAdminState(Manager::Get()->RequestNodeNeighborUpdate(homeId, node));
 					}
 				} else if (strcmp((char *)cp->conn_arg1, "assrr") == 0) {
 					if (cp->conn_arg2 != NULL && strlen((char *)cp->conn_arg2) > 4) {
 						uint8 node = strtol(((char *)cp->conn_arg2) + 4, NULL, 10);
 						setAdminFunction("Assign Return Route");
-						setAdminState(
-								Manager::Get()->BeginControllerCommand(homeId,
-										Driver::ControllerCommand_AssignReturnRoute,
-										web_controller_update, this, true, node));
+						setAdminState(Manager::Get()->AssignReturnRoute(homeId, node));
 					}
 				} else if (strcmp((char *)cp->conn_arg1, "delarr") == 0) {
 					if (cp->conn_arg2 != NULL && strlen((char *)cp->conn_arg2) > 4) {
 						uint8 node = strtol(((char *)cp->conn_arg2) + 4, NULL, 10);
 						setAdminFunction("Delete All Return Routes");
-						setAdminState(
-								Manager::Get()->BeginControllerCommand(homeId,
-										Driver::ControllerCommand_DeleteAllReturnRoutes,
-										web_controller_update, this, true, node));
+						setAdminState(Manager::Get()->DeleteAllReturnRoutes(homeId, node));
 					}
 				} else if (strcmp((char *)cp->conn_arg1, "snif") == 0) {
 					if (cp->conn_arg2 != NULL && strlen((char *)cp->conn_arg2) > 4) {
 						uint8 node = strtol(((char *)cp->conn_arg2) + 4, NULL, 10);
 						setAdminFunction("Send Node Information");
-						setAdminState(
-								Manager::Get()->BeginControllerCommand(homeId,
-										Driver::ControllerCommand_SendNodeInformation,
-										web_controller_update, this, true, node));
+						setAdminState(Manager::Get()->SendNodeInformation(homeId, node));
 					}
 				} else if (strcmp((char *)cp->conn_arg1, "reps") == 0) {
 					if (cp->conn_arg2 != NULL && strlen((char *)cp->conn_arg2) > 4) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave-controlpanel.git