minor revise

diff --git a/supervisor/ClientPrivilege.cpp b/supervisor/ClientPrivilege.cpp
index d208806b4024705452c4857a0e65b421a1ccf6e0..ed7bd5c1f440984c8cfd522cfa1a0d2845ebc490 100644 (file)
--- a/supervisor/ClientPrivilege.cpp
+++ b/supervisor/ClientPrivilege.cpp
@@ -25,57 +25,43 @@
 MODES_NAMESPACE_USE;
 
 ClientPrivilege::ClientPrivilege(GDBusMethodInvocation *invocation)
-       : handle(NULL), conf(NULL), client(NULL), user(NULL), clientSession(NULL)
+       : handle(NULL), client(NULL), user(NULL), clientSession(NULL)
 {
        int pid;
        GDBusConnection *conn = g_dbus_method_invocation_get_connection(invocation);
        // Do not free this string, it is owned by connection
        const char *senderUniqueName = g_dbus_method_invocation_get_sender(invocation);
 
-
        int ret = cynara_creds_gdbus_get_user(conn, senderUniqueName, USER_METHOD_DEFAULT, &user);
-       if (ret != CYNARA_API_SUCCESS)
+       if (CYNARA_API_SUCCESS != ret)
                ERR("cynara_creds_gdbus_get_user() Fail(%d)", ret);
 
        ret = cynara_creds_gdbus_get_client(conn, senderUniqueName, CLIENT_METHOD_DEFAULT, &client);
-       if (ret != CYNARA_API_SUCCESS)
+       if (CYNARA_API_SUCCESS != ret)
                ERR("cynara_creds_gdbus_get_client() Fail(%d)", ret);
 
        ret = cynara_creds_gdbus_get_pid(conn, senderUniqueName, &pid);
-       if (ret != CYNARA_API_SUCCESS)
+       if (CYNARA_API_SUCCESS != ret)
                ERR("cynara_creds_gdbus_get_pid() Fail(%d)", ret);
 
        clientSession = cynara_session_from_pid(pid);
        if (NULL == clientSession)
                ERR("cynara_session_from_pid() Fail()");
 
-       ret = cynara_configuration_create(&conf);
-       if (ret != CYNARA_API_SUCCESS)
-               ERR("cynara_configuration_create() Fail(%d)", ret);
-
-       ret = cynara_configuration_set_cache_size(conf, 100);
-       if (ret != CYNARA_API_SUCCESS) {
-               ERR("cynara_configuration_set_cache_size() Fail(%d)", ret);
-               cynara_configuration_destroy(conf);
-       }
-
-       ret = cynara_initialize(&handle, conf);
-       if (ret != CYNARA_API_SUCCESS) {
+       ret = cynara_initialize(&handle, NULL);
+       if (CYNARA_API_SUCCESS != ret)
                ERR("cynara_initialize() Fail(%d)", ret);
-               cynara_configuration_destroy(conf);
-       }
 }
 
 ClientPrivilege::~ClientPrivilege()
 {
-       cynara_configuration_destroy(conf);
        cynara_finish(handle);
        free(client);
        free(user);
        free(clientSession);
 }
 
-int ClientPrivilege::check(Mode &mode)
+int ClientPrivilege::check(const Mode &mode)
 {
        std::list<std::shared_ptr<Action>>::iterator it;
        auto actionList = mode.getActionList();

diff --git a/supervisor/ClientPrivilege.h b/supervisor/ClientPrivilege.h
index c163a0f711edf6fe05c13cce590500b85edc16f6..7b0b559646ef8c3b945dfd4e0629a1ba96d0ae33 100644 (file)
--- a/supervisor/ClientPrivilege.h
+++ b/supervisor/ClientPrivilege.h
@@ -27,10 +27,9 @@ class ClientPrivilege {
 public:
        ClientPrivilege(GDBusMethodInvocation *invocation);
        ~ClientPrivilege();
-       int check(Mode &mode);
+       int check(const Mode &mode);
 private:
        cynara *handle;
-       cynara_configuration *conf;
        char *client;
        char *user;
        char *clientSession;

diff --git a/supervisor/XMLGenerator.cpp b/supervisor/XMLGenerator.cpp
index 3b1e1c2030f1f4e8ccafb78a2792a81d2cbc8667..58ab16a921676c93f6a0efaf54ea5e331884a1cf 100644 (file)
--- a/supervisor/XMLGenerator.cpp
+++ b/supervisor/XMLGenerator.cpp
@@ -44,7 +44,7 @@ void XMLGenerator::createRootNode()
        return;
 }
 
-void XMLGenerator::write(const std::string &filename)
+void XMLGenerator::saveToFile(const std::string &filename)
 {
        int ret = xmlSaveFormatFile(filename.c_str(), doc, 1);
        if (-1 == ret) {
@@ -108,7 +108,7 @@ void XMLGenerator::makeModeXML(const std::string &filename, const Mode &mode)
                xmlAddChild(modeNode, actionNode);
        }
 
-       write(filename);
+       saveToFile(filename);
 
        doc->encoding = NULL;
        xmlFreeDoc(doc);
@@ -139,7 +139,7 @@ void XMLGenerator::makeUndoInfoXML(const std::string &filename, const Mode &mode
                xmlAddChild(undoInfoNode, infoNode);
        }
 
-       write(filename);
+       saveToFile(filename);
 
        doc->encoding = NULL;
        xmlFreeDoc(doc);

diff --git a/supervisor/XMLGenerator.h b/supervisor/XMLGenerator.h
index 335e7fbc8b692acac7c98e769947d0cd33894870..856e3e6ee27ad8caea3cb60626e192269394d91d 100644 (file)
--- a/supervisor/XMLGenerator.h
+++ b/supervisor/XMLGenerator.h
@@ -32,7 +32,7 @@ public:
 
 private:
        void createRootNode();
-       void write(const std::string &filename);
+       void saveToFile(const std::string &filename);
        const std::string getModeTypeStr(Mode::ModeType t);
 
        xmlDocPtr doc;