From: Maxim Mamontov <faust@stg.dp.ua>
Date: Thu, 8 Aug 2013 15:01:46 +0000 (+0300)
Subject: Small name fixes.
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/c9104229b3f6ee0320752780053ad97f5385359a?ds=inline;hp=-c

Small name fixes.
---

c9104229b3f6ee0320752780053ad97f5385359a
diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 9bbe62d7..0f5c9cc9 100644
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -369,17 +369,17 @@ if (!data->requst.prepaidTraff.res_empty())
 
 for (int i = 0; i < DIR_NUM; i++)
     {
-    if (!data->requst.up[i].res_empty())
+    if (!data->requst.sessionUpload[i].res_empty())
         cout << "session upload for dir" << i << "=" << info.stat.su[i] << endl;
-    if (!data->requst.down[i].res_empty())
+    if (!data->requst.sessionDownload[i].res_empty())
         cout << "session download for dir" << i << "=" << info.stat.sd[i] << endl;
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {
-    if (!data->requst.monthUp[i].res_empty())
+    if (!data->requst.monthUpload[i].res_empty())
         cout << "month upload for dir" << i << "=" << info.stat.mu[i] << endl;
-    if (!data->requst.monthDown[i].res_empty())
+    if (!data->requst.monthDownload[i].res_empty())
         cout << "month download for dir" << i << "=" << info.stat.md[i] << endl;
     }
 
diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index fae181f6..76a47824 100644
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -66,10 +66,10 @@ struct option long_options_get[] = {
 {"passive",     0, 0, 'i'},  //passive
 {"disable-stat",0, 0, 'S'},  //disable detail stat
 {"always-online",0, 0, 'O'}, //always online
-{"session-upload-dir",   1, 0, 500},  //SU0
-{"session-download-dir", 1, 0, 501},  //SD0
-{"month-upload-dir",     1, 0, 502},  //MU0
-{"month-download-dir",   1, 0, 503},  //MD0
+{"session-upload",   1, 0, 500},  //SU0
+{"session-download", 1, 0, 501},  //SD0
+{"month-upload",     1, 0, 502},  //MU0
+{"month-download",   1, 0, 503},  //MD0
 
 {"user-data",   1, 0, 700},  //UserData0
 
@@ -757,19 +757,19 @@ while (1)
 
         case 500: //U
             //printf("U%d\n", c - 500);
-            req.sessionUp[optarg] = 1;
+            req.sessionUpload[optarg] = 1;
             break;
         case 501:
             //printf("U%d\n", c - 500);
-            req.sessionDown[optarg] = 1;
+            req.sessionDownload[optarg] = 1;
             break;
         case 502:
             //printf("U%d\n", c - 500);
-            req.monthUp[optarg] = 1;
+            req.monthUpload[optarg] = 1;
             break;
         case 503:
             //printf("U%d\n", c - 500);
-            req.monthDown[optarg] = 1;
+            req.monthDownload[optarg] = 1;
             break;
 
         case 700: //UserData
diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index 5ce4d093..70c45059 100644
--- a/projects/sgconf/request.h
+++ b/projects/sgconf/request.h
@@ -90,11 +90,11 @@ RESETABLE<bool>     disableDetailStat;
 RESETABLE<bool>     alwaysOnline;
 RESETABLE<double>   prepaidTraff;
 
-RESETABLE<int64_t>  sessionUp[DIR_NUM];
-RESETABLE<int64_t>  sessionDown[DIR_NUM];
+RESETABLE<int64_t>  sessionUpload[DIR_NUM];
+RESETABLE<int64_t>  sessionDownload[DIR_NUM];
 
-RESETABLE<int64_t>  monthUp[DIR_NUM];
-RESETABLE<int64_t>  monthDown[DIR_NUM];
+RESETABLE<int64_t>  monthUpload[DIR_NUM];
+RESETABLE<int64_t>  monthDownload[DIR_NUM];
 
 RESETABLE<string>   userData[USERDATA_NUM];