Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/sgconf/parser.cpp b/projects/sgconf/parser.cpp
index 82b7ca9e5819e3ecb1de1f96c994c28ca67ec9d9..79833fd317d871a094407857660dfff2377e9e52 100644 (file)
--- a/projects/sgconf/parser.cpp
+++ b/projects/sgconf/parser.cpp
@@ -35,7 +35,8 @@
 
 #include "stg/common.h"
 #include "stg/netunit.h"
-#include "stg/request.h"
+
+#include "request.h"
 
 using namespace std;
 
@@ -86,7 +87,6 @@ parse_depth--;
 int ParseReply(void * data, list<string> * ans)
 {
 int done = 0;
-int len;
 
 parse_depth = 0;
 parser = XML_ParserCreate(NULL);
@@ -103,7 +103,7 @@ XML_SetElementHandler(parser, StartElement, EndElement);
 list<string>::iterator n = ans->begin();
 while (n != ans->end())
     {
-    len = strlen(n->c_str());
+    size_t len = strlen(n->c_str());
 
     if (++n == ans->end())
         done = 1;