Use std::jthread and C++17.

[stg.git] / projects / sgconf / services.cpp

diff --git a/projects/sgconf/services.cpp b/projects/sgconf/services.cpp
index 5c63f7e40f206987769fd9f88d0f64328802f954..ede820afb6e7c1d77926391d1b9b3177f9e644d5 100644 (file)
--- a/projects/sgconf/services.cpp
+++ b/projects/sgconf/services.cpp
@@ -24,11 +24,11 @@ if (level == 0)
 return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' ');
 }
 
 return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' ');
 }
 

-void PrintService(const STG::GET_SERVICE::INFO & info, size_t level = 0)
+void PrintService(const STG::GetService::Info & info, size_t level = 0)

 {
 std::cout << Indent(level, true) << "name: " << info.name << "\n"
           << Indent(level)       << "cost: " << info.cost << "\n"
 {
 std::cout << Indent(level, true) << "name: " << info.name << "\n"
           << Indent(level)       << "cost: " << info.cost << "\n"

-          << Indent(level)       << "payment day: " << info.payDay << "\n"
+          << Indent(level)       << "payment day: " << static_cast<unsigned>(info.payDay) << "\n"

           << Indent(level)       << "comment: " << info.comment << "\n";
 }
 
           << Indent(level)       << "comment: " << info.comment << "\n";
 }
 


@@ -55,7 +55,7 @@ std::cout << "Success.\n";
 
 void GetServicesCallback(bool result,
                          const std::string & reason,
 
 void GetServicesCallback(bool result,
                          const std::string & reason,

-                         const std::vector<STG::GET_SERVICE::INFO> & info,
+                         const std::vector<STG::GetService::Info> & info,

                          void * /*data*/)
 {
 if (!result)
                          void * /*data*/)
 {
 if (!result)


@@ -70,7 +70,7 @@ for (size_t i = 0; i < info.size(); ++i)
 
 void GetServiceCallback(bool result,
                         const std::string & reason,
 
 void GetServiceCallback(bool result,
                         const std::string & reason,

-                        const STG::GET_SERVICE::INFO & info,
+                        const STG::GetService::Info & info,

                         void * /*data*/)
 {
 if (!result)
                         void * /*data*/)
 {
 if (!result)


@@ -85,8 +85,10 @@ bool GetServicesFunction(const SGCONF::CONFIG & config,
                          const std::string & /*arg*/,
                          const std::map<std::string, std::string> & /*options*/)
 {
                          const std::string & /*arg*/,
                          const std::map<std::string, std::string> & /*options*/)
 {

-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),

                     config.port.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.GetServices(GetServicesCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.GetServices(GetServicesCallback, NULL) == STG::st_ok;


@@ -96,8 +98,10 @@ bool GetServiceFunction(const SGCONF::CONFIG & config,
                         const std::string & arg,
                         const std::map<std::string, std::string> & /*options*/)
 {
                         const std::string & arg,
                         const std::map<std::string, std::string> & /*options*/)
 {

-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),

                     config.port.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.GetService(arg, GetServiceCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.GetService(arg, GetServiceCallback, NULL) == STG::st_ok;


@@ -107,8 +111,10 @@ bool DelServiceFunction(const SGCONF::CONFIG & config,
                         const std::string & arg,
                         const std::map<std::string, std::string> & /*options*/)
 {
                         const std::string & arg,
                         const std::map<std::string, std::string> & /*options*/)
 {

-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),

                     config.port.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.DelService(arg, SimpleCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.DelService(arg, SimpleCallback, NULL) == STG::st_ok;


@@ -118,13 +124,15 @@ bool AddServiceFunction(const SGCONF::CONFIG & config,
                         const std::string & arg,
                         const std::map<std::string, std::string> & options)
 {
                         const std::string & arg,
                         const std::map<std::string, std::string> & options)
 {

-SERVICE_CONF_RES conf;
+STG::ServiceConfOpt conf;

 conf.name = arg;
 SGCONF::MaybeSet(options, "cost", conf.cost);
 SGCONF::MaybeSet(options, "pay-day", conf.payDay);
 SGCONF::MaybeSet(options, "comment", conf.comment);
 conf.name = arg;
 SGCONF::MaybeSet(options, "cost", conf.cost);
 SGCONF::MaybeSet(options, "pay-day", conf.payDay);
 SGCONF::MaybeSet(options, "comment", conf.comment);

-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),

                     config.port.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.AddService(arg, conf, SimpleCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.AddService(arg, conf, SimpleCallback, NULL) == STG::st_ok;


@@ -134,13 +142,15 @@ bool ChgServiceFunction(const SGCONF::CONFIG & config,
                         const std::string & arg,
                         const std::map<std::string, std::string> & options)
 {
                         const std::string & arg,
                         const std::map<std::string, std::string> & options)
 {

-SERVICE_CONF_RES conf;
+STG::ServiceConfOpt conf;

 conf.name = arg;
 SGCONF::MaybeSet(options, "cost", conf.cost);
 SGCONF::MaybeSet(options, "pay-day", conf.payDay);
 SGCONF::MaybeSet(options, "comment", conf.comment);
 conf.name = arg;
 SGCONF::MaybeSet(options, "cost", conf.cost);
 SGCONF::MaybeSet(options, "pay-day", conf.payDay);
 SGCONF::MaybeSet(options, "comment", conf.comment);

-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),

                     config.port.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.ChgService(conf, SimpleCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.ChgService(conf, SimpleCallback, NULL) == STG::st_ok;