X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..5b241162c3bb93887e18ff3b2774f2979780648b:/projects/sgconf/parser.cpp diff --git a/projects/sgconf/parser.cpp b/projects/sgconf/parser.cpp index 20dd0614..9d340e83 100644 --- a/projects/sgconf/parser.cpp +++ b/projects/sgconf/parser.cpp @@ -33,9 +33,9 @@ #include #include -#include "common.h" -#include "netunit.h" -#include "request.h" +#include "stg/common.h" +#include "stg/netunit.h" +#include "stg/request.h" using namespace std; @@ -86,7 +86,6 @@ parse_depth--; int ParseReply(void * data, list * ans) { int done = 0; -int len; parse_depth = 0; parser = XML_ParserCreate(NULL); @@ -103,16 +102,15 @@ XML_SetElementHandler(parser, StartElement, EndElement); list::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; - n--; + --n; 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);