X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2533d87d8779ba2520161c9d89bbc2d4e8b3c114..45043ba8ae9d21f69209fcb74f1715d97e4fc409:/projects/sgconf/parser.cpp?ds=inline diff --git a/projects/sgconf/parser.cpp b/projects/sgconf/parser.cpp index 990a2971..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,7 +102,7 @@ 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; @@ -111,8 +110,7 @@ while (n != ans->end()) 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);