Post-merge fixes.

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

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index bb4f59674a5d993bfe68dec37c53eb839e36241d..9c1b7283705bdf3cbc1652811e847c463b55cab9 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -129,7 +129,7 @@ printf("To get userdata<0...9> use:\n");
 printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --ud0 [--ud1 ...]\n\n");
 
 printf("To get user's authorizers list use:\n");
-printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --authorized-by\n");
+printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --authorized-by\n\n");
 
 printf("To send message use:\n");
 printf("sgconf set -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> -m <message>\n\n");
@@ -259,7 +259,7 @@ if (cd == (iconv_t) -1)
     exit(ICONV_ERR_CODE);
     }
 
-#if defined(FREE_BSD) || defined(FREE_BSD5)
+#if defined(CONST_ICONV)
 nconv = iconv(cd, (const char **)&inbuf, &insize, &outbuf, &outsize);
 #else
 nconv = iconv(cd, &inbuf, &insize, &outbuf, &outsize);
@@ -335,13 +335,13 @@ if (ud->login == "")
     return;
     }
 
-if (!req->cash.res_empty())
+if (!req->cash.empty())
     cout << "cash=" << ud->cash << endl;
 
-if (!req->credit.res_empty())
+if (!req->credit.empty())
     cout << "credit=" << ud->credit << endl;
 
-if (!req->creditExpire.res_empty())
+if (!req->creditExpire.empty())
     {
     char buf[32];
     struct tm brokenTime;
@@ -361,32 +361,32 @@ if (!req->creditExpire.res_empty())
     cout << "creditExpire=" << buf << endl;
     }
 
-if (!req->down.res_empty())
+if (!req->down.empty())
     cout << "down=" << ud->down << endl;
 
-if (!req->passive.res_empty())
+if (!req->passive.empty())
     cout << "passive=" << ud->passive << endl;
 
-if (!req->disableDetailStat.res_empty())
+if (!req->disableDetailStat.empty())
     cout << "disableDetailStat=" << ud->disableDetailStat << endl;
 
-if (!req->alwaysOnline.res_empty())
+if (!req->alwaysOnline.empty())
     cout << "alwaysOnline=" << ud->alwaysOnline << endl;
 
-if (!req->prepaidTraff.res_empty())
+if (!req->prepaidTraff.empty())
     cout << "prepaidTraff=" << ud->prepaidTraff << endl;
 
 for (int i = 0; i < DIR_NUM; i++)
     {
-    if (!req->u[i].res_empty())
+    if (!req->u[i].empty())
         cout << "u" << i << "=" << ud->stat.mu[i] << endl;
-    if (!req->d[i].res_empty())
+    if (!req->d[i].empty())
         cout << "d" << i << "=" << ud->stat.md[i] << endl;
     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
     {
-    if (!req->ud[i].res_empty())
+    if (!req->ud[i].empty())
         {
         string str;
         ConvertFromKOI8(ud->userData[i], &str);
@@ -408,7 +408,7 @@ StringReqParams strReqParams[] =
 };
 for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
     {
-    if (!strReqParams[i].reqParam.res_empty())
+    if (!strReqParams[i].reqParam.empty())
         {
         string str;
         ConvertFromKOI8(*strReqParams[i].value, &str);
@@ -425,8 +425,6 @@ abcbd = (AuthByCbData *)d;
 
 bool * result = abcbd->result;
 
-REQUEST * req = (REQUEST *)abcbd->data;
-
 for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
     cout << *it << "\n";
 cout << endl;