fix build error on 64bit architect

diff --git a/supervisor/ModeManager.cpp b/supervisor/ModeManager.cpp
index 2e533bcc10f93bbbe7b4cfc950aa0ef33722fa1e..8abbc405f2a37fd8031c303736a0d5184a789b4e 100644 (file)
--- a/supervisor/ModeManager.cpp
+++ b/supervisor/ModeManager.cpp
@@ -77,7 +77,7 @@ void ModeManager::addModeAttributes(ModeParser *parser, const string &path)
        Mode::ModeType type = parser->getModeType();
        modeMap.insert(std::make_pair(modeName, std::make_tuple(path, type, hidden)));
 
-       DBG("[%d] modeName : %s, modePath : %s, type : %d, hidden : %s", modeMap.size(), modeName.c_str(), path.c_str(), type, hidden? "true": "false");
+       DBG("[%zu] modeName : %s, modePath : %s, type : %d, hidden : %s", modeMap.size(), modeName.c_str(), path.c_str(), type, hidden? "true": "false");
 }
 
 int ModeManager::applyMode(const string &modeName, ClientPrivilege &priv, bool isTest)
@@ -151,7 +151,7 @@ int ModeManager::registerMode(const Mode &mode)
        }
 
        modeMap.insert(std::make_pair(mode.getName(), std::make_tuple(filename, mode.getModeType(), false)));
-       DBG("[%d] Register modeName : %s, modePath : %s, type : %d, hidden : false", modeMap.size(), mode.getName().c_str(), filename.c_str(), mode.getModeType());
+       DBG("[%zu] Register modeName : %s, modePath : %s, type : %d, hidden : false", modeMap.size(), mode.getName().c_str(), filename.c_str(), mode.getModeType());
 
        return MODES_ERROR_NONE;
 }

diff --git a/supervisor/RuleManager.cpp b/supervisor/RuleManager.cpp
index 55186c62e5e785ca39927b7f37a8599644e075ae..6965940b1c71ca01dc7d0e87ab0ec78fa4785369 100644 (file)
--- a/supervisor/RuleManager.cpp
+++ b/supervisor/RuleManager.cpp
@@ -70,7 +70,7 @@ void RuleManager::makeRuleMap()
                string fileFullPath = ruleDir + "/" + string(entry->d_name);
                try {
                        parseActionRule(fileFullPath);
-                       DBG("Action Rule(size=%d) Load", ruleMap.size());
+                       DBG("Action Rule(size=%zu) Load", ruleMap.size());
                } catch (ModesEx &e) {
                        ERR("parseActionRule(%s) Fail(%s) : It will be ignored", fileFullPath.c_str(), e.what());
                }

diff --git a/unittest/modes_test_plugin.cpp b/unittest/modes_test_plugin.cpp
index 0dde17e9b96b261b1ae06b47a2c9fc0d008ec944..2ebf59db9d96c4d3b824112dd307350febb72209 100644 (file)
--- a/unittest/modes_test_plugin.cpp
+++ b/unittest/modes_test_plugin.cpp
@@ -51,7 +51,7 @@ TEST(PluginMapper, readLibraryList)
                broker.piMapper.loadPlugins();
        }
        catch (ModesEx &e) {
-               broker.piMapper.setPluginDir("../../lib/modes-plugins");
+               broker.piMapper.setPluginDir("../../.." MODES_PLUGIN_DEFAULT_DIR);
                EXPECT_NO_THROW(broker.piMapper.loadPlugins());
        }
 
@@ -95,7 +95,7 @@ TEST(PluginMapper, getPluginTest)
                broker.piMapper.loadPlugins();
        }
        catch (ModesEx &e) {
-               broker.piMapper.setPluginDir("../../lib/modes-plugins");
+               broker.piMapper.setPluginDir("../../.." MODES_PLUGIN_DEFAULT_DIR);
                EXPECT_NO_THROW(broker.piMapper.loadPlugins());
        }