Rename 'new tariff' to 'next tariff' and remove conversion std::string to char* in...

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

diff --git a/projects/sgconf/parser.cpp b/projects/sgconf/parser.cpp
index 20dd06145b4331731b2678ddba43ea07d8db1735..82b7ca9e5819e3ecb1de1f96c994c28ca67ec9d9 100644 (file)
--- a/projects/sgconf/parser.cpp
+++ b/projects/sgconf/parser.cpp
@@ -33,9 +33,9 @@
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>
 

-#include "common.h"
-#include "netunit.h"
-#include "request.h"
+#include "stg/common.h"
+#include "stg/netunit.h"
+#include "stg/request.h"

 
 using namespace std;
 
 
 using namespace std;
 


@@ -107,12 +107,11 @@ while (n != ans->end())
 
     if (++n == ans->end())
         done = 1;
 
     if (++n == ans->end())
         done = 1;

-    n--;
+    --n;

 
     if (XML_Parse(parser, n->c_str(), len, done) == XML_STATUS_ERROR)
         {
 
     if (XML_Parse(parser, n->c_str(), len, done) == XML_STATUS_ERROR)
         {

-        char s[128];
-        printf(s, "Parse error at line %d:\n%s\n",
+        printf("Parse error at line %d:\n%s\n",

                XML_GetCurrentLineNumber(parser),
                XML_ErrorString(XML_GetErrorCode(parser)));
         exit(UNKNOWN_ERR_CODE);
                XML_GetCurrentLineNumber(parser),
                XML_ErrorString(XML_GetErrorCode(parser)));
         exit(UNKNOWN_ERR_CODE);