Produce debug output only if SMUX_DEBUG is defined

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index 8a01f169f35d2401e955d73ddc0f59defdb1fee8..2a9365569b49282003985540cf82507964fac22f 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -9,11 +9,11 @@
 #include <cerrno>
 #include <sstream>
 
 #include <cerrno>
 #include <sstream>
 

+#include "stg/version.h"
+#include "stg/tariffs.h"
+#include "stg/user_property.h"
+#include "stg/settings.h"

 #include "parser.h"
 #include "parser.h"

-#include "version.h"
-#include "tariffs.h"
-#include "user_property.h"
-#include "../../../settings.h"

 
 #define  UNAME_LEN      (256)
 //-----------------------------------------------------------------------------
 
 #define  UNAME_LEN      (256)
 //-----------------------------------------------------------------------------


@@ -63,13 +63,13 @@ answerList->push_back("<ServerInfo>");
 sprintf(s, "<version value=\"%s\"/>", SERVER_VERSION);
 answerList->push_back(s);
 
 sprintf(s, "<version value=\"%s\"/>", SERVER_VERSION);
 answerList->push_back(s);
 

-sprintf(s, "<tariff_num value=\"%d\"/>", tariffs->GetTariffsNum());
+sprintf(s, "<tariff_num value=\"%llu\"/>", (unsigned long long)tariffs->Count());

 answerList->push_back(s);
 
 sprintf(s, "<tariff value=\"%d\"/>", 2);
 answerList->push_back(s);
 
 answerList->push_back(s);
 
 sprintf(s, "<tariff value=\"%d\"/>", 2);
 answerList->push_back(s);
 

-sprintf(s, "<users_num value=\"%d\"/>", users->GetUserNum());
+sprintf(s, "<users_num value=\"%llu\"/>", (unsigned long long)users->Count());

 answerList->push_back(s);
 
 sprintf(s, "<uname value=\"%s\"/>", un);
 answerList->push_back(s);
 
 sprintf(s, "<uname value=\"%s\"/>", un);